Revert "Ensure llvm doesn't trigger an assert for crazy transmutes"

This reverts commit 776c632e2a9a044fd134321a9d561e28994ff3ff.
rust-lang · May 24, 2018 · fb9060a · fb9060a
1 parent 85de4ef
commit fb9060a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/librustc_codegen_llvm/mir/constant.rs b/src/librustc_codegen_llvm/mir/constant.rs
@@ -70,8 +70,11 @@ pub fn scalar_to_llvm(cx: &CodegenCx,
                 &C_usize(cx, ptr.offset.bytes()),
                 1,
             ) };
-            let llval = unsafe { llvm::LLVMConstPtrToInt(llval, llty.to_ref()) };
-            consts::bitcast(llval, llty)
+            if layout.value != layout::Pointer {
+                unsafe { llvm::LLVMConstPtrToInt(llval, llty.to_ref()) }
+            } else {
+                consts::bitcast(llval, llty)
+            }
         }
     }
 }