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

oli-obk · oli-obk · commit fb9060ac0686 · 2018-05-24T20:49:38.000+02:00
This reverts commit 776c632e2a9a044fd134321a9d561e28994ff3ff.
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)
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,11 @@ pub fn scalar_to_llvm(cx: &CodegenCx,`
`70`	`70`	`&C_usize(cx, ptr.offset.bytes()),`
`71`	`71`	`1,`
`72`	`72`	`) };`
`73`		`- let llval = unsafe { llvm::LLVMConstPtrToInt(llval, llty.to_ref()) };`
`74`		`- consts::bitcast(llval, llty)`
	`73`	`+ if layout.value != layout::Pointer {`
	`74`	`+ unsafe { llvm::LLVMConstPtrToInt(llval, llty.to_ref()) }`
	`75`	`+ } else {`
	`76`	`+ consts::bitcast(llval, llty)`
	`77`	`+ }`
`75`	`78`	`}`
`76`	`79`	`}`
`77`	`80`	`}`