mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LLVMRustConstInt128Get on stage1 too

Browse Source 
llvm::LLVMConstIntGetZExtValue doesn't accept values with more than 64 bits.

This fixes an LLVM assertion error when compiling libcore with stage1:

src/llvm/include/llvm/ADT/APInt.h:1336:
	uint64_t llvm::APInt::getZExtValue() const:
		Assertion `getActiveBits() <= 64 && "Too many bits for uint64_t"' failed.
This commit is contained in:
est31 2016-11-20 05:06:53 +01:00
parent 32d8d24159
commit 8bcb021991
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc_trans/common.rs
View File

@ -592,23 +592,18 @@ fn is_const_integral(v: ValueRef) -> bool {
}
}
#[inline]
#[cfg(stage0)]
pub fn const_to_opt_u128(v: ValueRef, sign_ext: bool) -> Option<u128> {
unsafe {
if is_const_integral(v) {
if !sign_ext {
Some(llvm::LLVMConstIntGetZExtValue(v))
} else {
Some(llvm::LLVMConstIntGetSExtValue(v) as u64)
}
} else {
None
}
}
fn hi_lo_to_u128(lo: u64, _: u64) -> u128 {
lo as u128
}
#[inline]
#[cfg(not(stage0))]
fn hi_lo_to_u128(lo: u64, hi: u64) -> u128 {
((hi as u128) << 64) | (lo as u128)
}
pub fn const_to_opt_u128(v: ValueRef, sign_ext: bool) -> Option<u128> {
unsafe {
if is_const_integral(v) {
@ -616,7 +611,7 @@ pub fn const_to_opt_u128(v: ValueRef, sign_ext: bool) -> Option<u128> {
let success = llvm::LLVMRustConstInt128Get(v, sign_ext,
&mut hi as *mut u64, &mut lo as *mut u64);
if success {
Some(((hi as u128) << 64) | (lo as u128))
Some(hi_lo_to_u128(lo, hi))
} else {
None
}