---

yaml
---
r: 11841
b: refs/heads/master
c: 0cd72d2
h: refs/heads/master
i:
  11839: e810458
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 45d0b5f0b9bbcf97bc985fd26d64564273b7547a
+refs/heads/master: 0cd72d24dcf39376a4c4f74520ae614d9fb90058
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

@@ -1849,6 +1849,10 @@ fn autoderef(cx: block, v: ValueRef, t: ty::t) -> result_t {
             t1 = derefed.t;
             v1 = derefed.v;
           }
+          ty::ty_rptr(_, mt) {
+            t1 = mt.ty;
+            v1 = v;
+          }
           ty::ty_res(did, inner, tps) {
             t1 = ty::substitute_type_params(ccx.tcx, tps, inner);
             v1 = GEPi(cx, v1, [0, 1]);

trunk/src/rustc/middle/ty.rs

@@ -1119,7 +1119,7 @@ fn type_autoderef(cx: ctxt, t: t) -> t {
     let t1 = t;
     loop {
         alt get(t1).struct {
-          ty_box(mt) | ty_uniq(mt) { t1 = mt.ty; }
+          ty_box(mt) | ty_uniq(mt) | ty::ty_rptr(_, mt) { t1 = mt.ty; }
           ty_res(_, inner, tps) {
             t1 = substitute_type_params(cx, tps, inner);
           }

trunk/src/rustc/middle/typeck.rs

@@ -1058,7 +1058,7 @@ fn do_autoderef(fcx: @fn_ctxt, sp: span, t: ty::t) -> ty::t {
     let t1 = t;
     loop {
         alt structure_of(fcx, sp, t1) {
-          ty::ty_box(inner) | ty::ty_uniq(inner) {
+          ty::ty_box(inner) | ty::ty_uniq(inner) | ty::ty_rptr(_, inner) {
             alt ty::get(t1).struct {
               ty::ty_var(v1) {
                 ty::occurs_check(fcx.ccx.tcx, sp, v1,