---

yaml
---
r: 45050
b: refs/heads/master
c: 27668fb
h: refs/heads/master
v: v3

Author: jdm

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7bb03345cf368360912c7cc12e500d8d5508f352
+refs/heads/master: 27668fbfab593c0e671f0ef104b1d677a770ea7c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/middle/trans/consts.rs

@@ -345,6 +345,9 @@ fn const_expr_unchecked(cx: @CrateContext, e: @ast::expr) -> ValueRef {
               (expr::cast_pointer, expr::cast_pointer) => {
                 llvm::LLVMConstPointerCast(v, llty)
               }
+              (expr::cast_integral, expr::cast_pointer) => {
+                llvm::LLVMConstIntToPtr(v, llty)
+              }
               _ => {
                 cx.sess.impossible_case(e.span,
                                         ~"bad combination of types for cast")

trunk/src/test/run-pass/const-cast-ptr-int.rs

@@ -0,0 +1,15 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+const a: *u8 = 0 as *u8;
+
+fn main() {
+    assert a == ptr::null();
+}