Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some hacks and unignore some tests on early stages thanks to beta update #39521

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/libcompiler_builtins/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,7 @@ pub mod reimpls {
const MD1 : u32 = MANTISSA_DIGITS + 1;
const MD2 : u32 = MANTISSA_DIGITS + 2;

// SNAP: replace this with !0u128
let negn :u128 = !0;
let negn = !0u128;

if sd > MANTISSA_DIGITS {
a = match sd {
Expand Down Expand Up @@ -579,8 +578,7 @@ pub mod reimpls {
const MD1 : u32 = MANTISSA_DIGITS + 1;
const MD2 : u32 = MANTISSA_DIGITS + 2;

// SNAP: replace this with !0u128
let negn :u128 = !0;
let negn = !0u128;

if sd > MANTISSA_DIGITS {
a = match sd {
Expand Down
7 changes: 2 additions & 5 deletions src/librustc_const_eval/eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -483,11 +483,8 @@ fn eval_const_expr_partial<'a, 'tcx>(cx: &ConstContext<'a, 'tcx>,
return Ok(Integral(I64(i64::min_value())))
},
(&LitKind::Int(n, _), Some(&ty::TyInt(IntTy::I128))) |
(&LitKind::Int(n, Signed(IntTy::I128)), _) => {
// SNAP: replace n in pattern with I128_OVERFLOW and remove this if.
if n == I128_OVERFLOW {
return Ok(Integral(I128(i128::min_value())))
}
(&LitKind::Int(I128_OVERFLOW, Signed(IntTy::I128)), _) => {
return Ok(Integral(I128(i128::min_value())))
},
(&LitKind::Int(n, _), Some(&ty::TyInt(IntTy::Is))) |
(&LitKind::Int(n, Signed(IntTy::Is)), _) => {
Expand Down
6 changes: 2 additions & 4 deletions src/librustc_const_math/int.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,11 @@ impl ConstInt {
(InferSigned(a @ 0...ibounds::U8MAX), U8(_)) => U8(a as u8),
(InferSigned(a @ 0...ibounds::U16MAX), U16(_)) => U16(a as u16),
(InferSigned(a @ 0...ibounds::U32MAX), U32(_)) => U32(a as u32),
// SNAP: replace with U64MAX
(InferSigned(a @ 0...ibounds::I64MAX), U64(_)) => U64(a as u64),
(InferSigned(a @ 0...ibounds::U64MAX), U64(_)) => U64(a as u64),
(InferSigned(a @ 0...ibounds::I128MAX), U128(_)) => U128(a as u128),
(InferSigned(a @ 0...ibounds::U16MAX), Usize(Us16(_))) => Usize(Us16(a as u16)),
(InferSigned(a @ 0...ibounds::U32MAX), Usize(Us32(_))) => Usize(Us32(a as u32)),
// SNAP: replace with U64MAX
(InferSigned(a @ 0...ibounds::I64MAX), Usize(Us64(_))) => Usize(Us64(a as u64)),
(InferSigned(a @ 0...ibounds::U64MAX), Usize(Us64(_))) => Usize(Us64(a as u64)),
(InferSigned(_), _) => return Err(ConstMathErr::NotInRange),
_ => self, // already known types
};
Expand Down
11 changes: 3 additions & 8 deletions src/librustc_trans/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,9 @@ pub fn C_integral(t: Type, u: u64, sign_extend: bool) -> ValueRef {
}

pub fn C_big_integral(t: Type, u: u128, sign_extend: bool) -> ValueRef {
if ::std::mem::size_of::<u128>() == 16 {
unsafe {
let words = [u as u64, u.wrapping_shr(64) as u64];
llvm::LLVMConstIntOfArbitraryPrecision(t.to_ref(), 2, words.as_ptr())
}
} else {
// SNAP: remove after snapshot
C_integral(t, u as u64, sign_extend)
unsafe {
let words = [u as u64, u.wrapping_shr(64) as u64];
llvm::LLVMConstIntOfArbitraryPrecision(t.to_ref(), 2, words.as_ptr())
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/test/run-pass/i128-ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-stage0
// ignore-stage1

// MSVC doesn't support 128 bit integers, and other Windows
// C compilers have very inconsistent views on how the ABI
// should look like.
Expand Down
3 changes: 0 additions & 3 deletions src/test/run-pass/i128.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-stage0
// ignore-stage1

// ignore-emscripten

#![feature(i128_type, test)]
Expand Down
5 changes: 1 addition & 4 deletions src/test/run-pass/issue-38987.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@
// <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.
#![feature(i128_type)]

// SNAP: run on all stages after snapshot, i128 currently doesn't work on stages 0 and 1
// ignore-stage1
// ignore-stage0
#![feature(i128_type)]

fn main() {
let _ = -0x8000_0000_0000_0000_0000_0000_0000_0000i128;
Expand Down
3 changes: 0 additions & 3 deletions src/test/run-pass/u128.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-stage0
// ignore-stage1

// ignore-emscripten

#![feature(i128_type, test)]
Expand Down