---

pcwalton · pcwalton · commit 469c907797cb · 2011-03-18T18:12:58.000-07:00
yaml --- r: 1718 b: refs/heads/master c: 8c48fae h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c0c0af1b225bc26c0b73434221efe6ffbb373c3
+refs/heads/master: 8c48fae72631720c8edd8cf0fb58de44e7978538
diff --git a/trunk/src/comp/middle/trans.rs b/trunk/src/comp/middle/trans.rs
@@ -3596,7 +3596,9 @@ fn trans_cast(@block_ctxt cx, @ast.expr e, &ast.ann ann) -> result {
     auto t = node_ann_type(cx.fcx.ccx, ann);
     auto lldsttype = type_of(cx.fcx.ccx, t);
     if (!ty.type_is_fp(t)) {
-        if (llvm.LLVMGetIntTypeWidth(lldsttype) >
+        if (ty.type_is_native(ty.expr_ty(e))) {
+            e_res.val = e_res.bcx.build.PtrToInt(e_res.val, lldsttype);
+        } else if (llvm.LLVMGetIntTypeWidth(lldsttype) >
             llvm.LLVMGetIntTypeWidth(llsrctype)) {
             if (ty.type_is_signed(t)) {
                 // Widening signed cast.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 9c0c0af1b225bc26c0b73434221efe6ffbb373c3`
	`2`	`+refs/heads/master: 8c48fae72631720c8edd8cf0fb58de44e7978538`