---

yaml
---
r: 138923
b: refs/heads/try2
c: 122e4a2
h: refs/heads/master
i:
  138921: c8debb7
  138919: b12f278
v: v3

Author: jld

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c929ddde1650b4cde91efd435d7807dd313c2e9b
+refs/heads/try2: 122e4a28b83ca0d3b3aef9b39eed414da54c4523
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/consts.rs

@@ -182,8 +182,10 @@ pub fn const_expr(cx: @CrateContext, e: @ast::expr) -> ValueRef {
         }
         Some(@ty::AutoDerefRef(ref adj)) => {
             let mut ty = ety;
+            let mut maybe_ptr = None;
             for adj.autoderefs.times {
                 let (dv, dt) = const_deref(cx, llconst, ty, false);
+                maybe_ptr = Some(llconst);
                 llconst = dv;
                 ty = dt;
             }
@@ -193,17 +195,21 @@ pub fn const_expr(cx: @CrateContext, e: @ast::expr) -> ValueRef {
                 Some(ref autoref) => {
                     fail_unless!(autoref.region == ty::re_static);
                     fail_unless!(autoref.mutbl != ast::m_mutbl);
+                    // Don't copy data to do a deref+ref.
+                    let llptr = match maybe_ptr {
+                        Some(ptr) => ptr,
+                        None => const_addr_of(cx, llconst)
+                    };
                     match autoref.kind {
                         ty::AutoPtr => {
-                            llconst = const_addr_of(cx, llconst);
+                            llconst = llptr;
                         }
                         ty::AutoBorrowVec => {
-                            let base = const_addr_of(cx, llconst);
                             let size = machine::llsize_of(cx,
                                                           val_ty(llconst));
                             fail_unless!(abi::slice_elt_base == 0);
                             fail_unless!(abi::slice_elt_len == 1);
-                            llconst = C_struct(~[base, size]);
+                            llconst = C_struct(~[llptr, size]);
                         }
                         _ => {
                             cx.sess.span_bug(e.span,

branches/try2/src/test/run-pass/const-region-ptrs-noncopy.rs

@@ -0,0 +1,18 @@
+// 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.
+
+type Big = [u64 * 8];
+struct Pair { a: int, b: &'self Big }
+const x: &'static Big = &([13, 14, 10, 13, 11, 14, 14, 15]);
+const y: &'static Pair<'static> = &Pair {a: 15, b: x};
+
+pub fn main() {
+    fail_unless!(ptr::addr_of(x) == ptr::addr_of(y.b));
+}