about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjörn Steinbrink <bsteinbr@gmail.com>2015-11-20 21:42:13 +0100
committerBjörn Steinbrink <bsteinbr@gmail.com>2015-11-20 21:42:13 +0100
commit6741f3315af8c8f124796b4fde042a1099588598 (patch)
tree2db4270436bd2c5b79fb3ea1ed64d558b45541d6
parentf8827f527560a5ddea50a213440a89d3bff2bfea (diff)
downloadrust-6741f3315af8c8f124796b4fde042a1099588598.tar.gz
rust-6741f3315af8c8f124796b4fde042a1099588598.zip
Avoid FCA loads and extractvalue when copying fat pointers
Since fat pointers do not qualify as structural types, they got copied
using load_ty and store_ty, which means that we load an FCA and use
extractvalue to get the components of the fat pointer. This breaks
certain optimizations in LLVM.

Found via apasel422/ref_count#13
-rw-r--r--src/librustc_trans/trans/base.rs3
-rw-r--r--src/test/codegen/fatptr.rs22
2 files changed, 25 insertions, 0 deletions
diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs
index 0af47550d75..e291482a4aa 100644
--- a/src/librustc_trans/trans/base.rs
+++ b/src/librustc_trans/trans/base.rs
@@ -1223,6 +1223,9 @@ pub fn memcpy_ty<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, dst: ValueRef, src: ValueRe
         let llsz = llsize_of(ccx, llty);
         let llalign = type_of::align_of(ccx, t);
         call_memcpy(bcx, dst, src, llsz, llalign as u32);
+    } else if common::type_is_fat_ptr(bcx.tcx(), t) {
+        let (data, extra) = load_fat_ptr(bcx, src, t);
+        store_fat_ptr(bcx, data, extra, dst, t);
     } else {
         store_ty(bcx, load_ty(bcx, src, t), dst, t);
     }
diff --git a/src/test/codegen/fatptr.rs b/src/test/codegen/fatptr.rs
new file mode 100644
index 00000000000..b9e6508dfff
--- /dev/null
+++ b/src/test/codegen/fatptr.rs
@@ -0,0 +1,22 @@
+// Copyright 2015 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.
+
+// compile-flags: -C no-prepopulate-passes
+
+#![crate_type = "lib"]
+
+pub trait T {}
+
+// CHECK-LABEL: @copy_fat_ptr
+#[no_mangle]
+pub fn copy_fat_ptr(x: &T) {
+// CHECK-NOT: extractvalue
+    let x2 = x;
+}