---

yaml
---
r: 140751
b: refs/heads/try2
c: fa1a172
h: refs/heads/master
i:
  140749: ee358a9
  140747: f902b6b
  140743: 6efd1da
  140735: 9cd40f6
v: v3

Author: Thiez

[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: a9f21326062b0b455aebd2459e8406b03a048a26
+refs/heads/try2: fa1a172f9c8b5071a7bc9d818bfa6ae26401ec5b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -541,10 +541,7 @@ pub fn AtomicLoad(cx: block, PointerVal: ValueRef, order: AtomicOrdering) -> Val
     unsafe {
         let ccx = cx.fcx.ccx;
         if cx.unreachable {
-            let ty = val_ty(PointerVal);
-            let eltty = if llvm::LLVMGetTypeKind(ty) == lib::llvm::Array {
-                llvm::LLVMGetElementType(ty) } else { ccx.int_type };
-            return llvm::LLVMGetUndef(eltty);
+            return llvm::LLVMGetUndef(ccx.int_type);
         }
         count_insn(cx, "load.atomic");
         return llvm::LLVMBuildAtomicLoad(B(cx), PointerVal, order);