[MIR] Fix double-rounding of float constants and ignore NaN sign in tests. by eddyb · Pull Request #34006 · rust-lang/rust

eddyb · 2016-06-01T09:50:19Z

Fixes#32805 by handling f32 and f64 separately in rustc_const_eval.

Also removes #[rustc_no_mir] from a couple libstd tests by ignoring NaN sign.
Turns out that runtime evaluation of 0.0 / 0.0 produces a NaN with the sign bit set,
whereas LLVM constant folds it to a NaN with the sign bit unset, which we were testing for.

rust-highfive · 2016-06-01T09:50:32Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

oli-obk · 2016-06-01T10:33:22Z

This also needs the FInfer + F32 branches for f32 inference

Oops, thanks for noticing!

nagisa · 2016-06-02T23:20:30Z

I can’t believe this test worked for so long on all of the platforms we support, because mantissa of NaN is not specified to be anything in particular. The only requirement is that the MSB of the mantissa is set to 1 to differentiate from infinity.

@nagisa Well, LLVM was always doing the folding for us, and it always produces the same result.

nikomatsakis · 2016-06-05T11:21:18Z

@bors r+

bors · 2016-06-05T11:21:19Z

📌 Commit 29b1af5 has been approved by nikomatsakis

bors · 2016-06-05T16:07:37Z

🔒 Merge conflict

bors · 2016-06-05T16:12:02Z

☔ The latest upstream changes (presumably #33905) made this pull request unmergeable. Please resolve the merge conflicts.

eddyb · 2016-06-05T16:18:52Z

@bors r=nikomatsakis

bors · 2016-06-05T16:18:53Z

📌 Commit c77166c has been approved by nikomatsakis

bors · 2016-06-05T19:05:39Z

⌛ Testing commit c77166c with merge 6e577ca...

bors · 2016-06-05T19:19:26Z

💔 Test failed - auto-win-msvc-64-opt

eddyb · 2016-06-05T19:32:28Z

@bors r=nikomatsakis

bors · 2016-06-05T19:32:29Z

📌 Commit f158a2f has been approved by nikomatsakis

bors · 2016-06-05T21:17:12Z

⌛ Testing commit f158a2f with merge e19ccb5...

bors · 2016-06-05T21:21:42Z

⛄ The build was interrupted to prioritize another pull request.

bors · 2016-06-05T23:09:47Z

⌛ Testing commit f158a2f with merge 323e9ca...

bors · 2016-06-06T01:24:21Z

💔 Test failed - auto-mac-64-opt-rustbuild

eddyb · 2016-06-06T03:50:18Z

@alexcrichton ^^ Spurious?

alexcrichton · 2016-06-06T08:13:22Z

@eddyb hm maybe yeah, I can't really come up with an explanation otherwise. PR definitely doesn't touch Cargo.* anywhere as "cargo" isn't anywhere in the diff, so I'm not really sure how this could happen. Let's retry for now and if it happens again I can try to investigate further.

@bors: retry

bors · 2016-06-06T12:08:51Z

⌛ Testing commit f158a2f with merge 763f923...

[MIR] Fix double-rounding of float constants and ignore NaN sign in tests. Fixes#32805 by handling f32 and f64 separately in rustc_const_eval. Also removes `#[rustc_no_mir]` from a couple libstd tests by ignoring NaN sign. Turns out that runtime evaluation of `0.0 / 0.0` produces a NaN with the sign bit set, whereas LLVM constant folds it to a NaN with the sign bit unset, which we were testing for.

bors · 2016-06-06T15:19:59Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

rust-highfive assigned nikomatsakis Jun 1, 2016

oli-obk reviewed Jun 1, 2016
View reviewed changes

eddyb force-pushed the mir-const-fixes branch from 42c65a9 to 29b1af5Compare June 1, 2016 10:50

nagisa reviewed Jun 2, 2016
View reviewed changes

eddyb added 2 commits June 5, 2016 19:17

test: don't assume anything about the sign of NAN.
2767361

rustc_const_eval: work around double rounding.
c77166c

eddyb force-pushed the mir-const-fixes branch from 29b1af5 to c77166cCompare June 5, 2016 16:18

eddyb mentioned this pull request Jun 5, 2016
Switch to MIR-based translation by default. #34096
Merged

mir: remove unused float support from zero_literal.
f158a2f

bors merged commit f158a2f into rust-lang:masterJun 6, 2016

eddyb deleted the mir-const-fixes branch June 6, 2016 15:21

Uh oh!

Uh oh!

Conversation

eddyb commented Jun 1, 2016

Uh oh!

rust-highfive commented Jun 1, 2016

Uh oh!

oli-obkJun 1, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eddybJun 1, 2016

Choose a reason for hiding this comment

Uh oh!

nagisaJun 2, 2016

Choose a reason for hiding this comment

Uh oh!

eddybJun 2, 2016

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

eddyb commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

eddyb commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 5, 2016

Uh oh!

bors commented Jun 6, 2016

Uh oh!

eddyb commented Jun 6, 2016

Uh oh!

alexcrichton commented Jun 6, 2016

Uh oh!

bors commented Jun 6, 2016

Uh oh!

bors commented Jun 6, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

oli-obkJun 1, 2016•
edited
Loading