---

yaml
---
r: 6091
b: refs/heads/master
c: 5b0c103
h: refs/heads/master
i:
  6089: 3db02e0
  6087: 5c754bf
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a20eed2db233dad2eb9594cf28790842970c1d6
+refs/heads/master: 5b0c103b39e5392c267e66f8aad380c34c60f5b5

trunk/src/comp/middle/trans.rs

@@ -3269,12 +3269,13 @@ fn trans_cast(cx: @block_ctxt, e: @ast::expr, id: ast::node_id,
     check (type_has_static_size(ccx, t_out));
     let ll_t_out = type_of(ccx, e.span, t_out);
 
-    tag kind { native_; integral; float; other; }
+    tag kind { pointer; integral; float; other; }
     fn t_kind(tcx: ty::ctxt, t: ty::t) -> kind {
         ret if ty::type_is_fp(tcx, t) {
                 float
-            } else if ty::type_is_native(tcx, t) {
-                native_
+            } else if ty::type_is_native(tcx, t) ||
+                      ty::type_is_unsafe_ptr(tcx, t) {
+                pointer
             } else if ty::type_is_integral(tcx, t) {
                 integral
             } else { other };
@@ -3301,13 +3302,13 @@ fn trans_cast(cx: @block_ctxt, e: @ast::expr, id: ast::node_id,
                 FPToSI(e_res.bcx, e_res.val, ll_t_out)
             } else { FPToUI(e_res.bcx, e_res.val, ll_t_out) }
           }
-          {in: integral., out: native_.} {
+          {in: integral., out: pointer.} {
             IntToPtr(e_res.bcx, e_res.val, ll_t_out)
           }
-          {in: native_., out: integral.} {
+          {in: pointer., out: integral.} {
             PtrToInt(e_res.bcx, e_res.val, ll_t_out)
           }
-          {in: native_., out: native_.} {
+          {in: pointer., out: pointer.} {
             PointerCast(e_res.bcx, e_res.val, ll_t_out)
           }
           _ { ccx.sess.bug("Translating unsupported cast.") }

trunk/src/comp/middle/ty.rs

@@ -153,6 +153,7 @@ export type_is_bot;
 export type_is_box;
 export type_is_boxed;
 export type_is_unique_box;
+export type_is_unsafe_ptr;
 export type_is_vec;
 export type_is_fp;
 export type_allows_implicit_copy;
@@ -885,6 +886,13 @@ pure fn type_is_unique_box(cx: ctxt, ty: t) -> bool {
     }
 }
 
+pure fn type_is_unsafe_ptr(cx: ctxt, ty: t) -> bool {
+    alt struct(cx, ty) {
+      ty_ptr(_) { ret true; }
+      _ { ret false; }
+    }
+}
+
 pure fn type_is_vec(cx: ctxt, ty: t) -> bool {
     ret alt struct(cx, ty) {
           ty_vec(_) { true }