---

yaml
---
r: 35265
b: refs/heads/master
c: 430583c
h: refs/heads/master
i:
  35263: e650357
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 07f4031bb40967f9c5c0ee61b71e1d9cffd34b58
+refs/heads/master: 430583c8b4efdccb19e87b2f312fc22118c6685c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/middle/typeck/infer/assignment.rs

@@ -136,9 +136,9 @@ priv impl Assign {
 
         match (a_bnd, b_bnd) {
             (Some(a_bnd), Some(b_bnd)) => {
-                // check for a case where a non-region pointer (@, ~) is
-                // being assigned to a region pointer:
                 match (ty::get(a_bnd).sty, ty::get(b_bnd).sty) {
+                    // check for a case where a non-region pointer (@, ~) is
+                    // being assigned to a region pointer:
                     (ty::ty_box(_), ty::ty_rptr(r_b, mt_b)) => {
                         let nr_b = ty::mk_box(self.infcx.tcx,
                                               {ty: mt_b.ty, mutbl: m_const});
@@ -184,8 +184,16 @@ priv impl Assign {
                                         a, nr_b, m_imm, b_f.meta.region)
                     }
 
+                    // check for &T being assigned to *T:
+                    (ty::ty_rptr(_, ref a_t), ty::ty_ptr(ref b_t)) => {
+                        match Sub(*self).mts(*a_t, *b_t) {
+                            Ok(_) => Ok(None),
+                            Err(e) => Err(e)
+                        }
+                    }
+
+                    // otherwise, assignment follows normal subtype rules:
                     _ => {
-                        // otherwise, assignment follows normal subtype rules:
                         to_ares(Sub(*self).tys(a, b))
                     }
                 }

trunk/src/test/run-pass/unsafe-pointer-assignability.rs

@@ -0,0 +1,12 @@
+fn f(x: *int) {
+    unsafe {
+        assert *x == 3;
+    }
+}
+
+fn main() {
+    f(&3);
+}
+
+
+