Skip to content

Commit

Permalink
Allow casting integers to unsafe pointers in constant expressions.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdm committed Mar 7, 2013
1 parent 7bb0334 commit 27668fb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/librustc/middle/trans/consts.rs
Expand Up @@ -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")
Expand Down
15 changes: 15 additions & 0 deletions 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();
}

5 comments on commit 27668fb

@bors
Copy link
Contributor

@bors bors commented on 27668fb Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at jdm@27668fb

@bors
Copy link
Contributor

@bors bors commented on 27668fb Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jdm/rust/newconst = 27668fb into auto

@bors
Copy link
Contributor

@bors bors commented on 27668fb Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jdm/rust/newconst = 27668fb merged ok, testing candidate = 7140d7c

@bors
Copy link
Contributor

@bors bors commented on 27668fb Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 27668fb Mar 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 7140d7c

Please sign in to comment.