Only allow using the atomic intrinsics on integer types by Amanieu · Pull Request #32647 · rust-lang/rust

Amanieu · 2016-03-31T13:38:27Z

Using these with non-integer types results in LLVM asserts. Atomic operations on non-integer types will require values be transmuted into an integer type of suitable size.

This doesn't affect the standard library since AtomicBool and AtomicPtr currently use usize for atomic operations.

r? @eddyb

eddyb · 2016-03-31T13:43:32Z

Can you add a compile-fail test for the errors?

Amanieu · 2016-03-31T14:28:44Z

Done (and fixed a few bugs)

Amanieu · 2016-03-31T14:55:43Z

Updated to fix make check complaints about line length

Amanieu · 2016-03-31T15:04:05Z

Fixed more line lengths...

eddyb · 2016-03-31T15:30:49Z

@bors r+

bors · 2016-03-31T15:30:50Z

📌 Commit c3668f9 has been approved by eddyb

Rollup of 11 pull requests - Successful merges: #32622, #32629, #32640, #32641, #32642, #32645, #32647, #32649, #32652, #32654, #32656 - Failed merges:

bors · 2016-04-02T21:21:11Z

⌛ Testing commit c3668f9 with merge 434c58e...

bors · 2016-04-02T22:51:59Z

💔 Test failed - auto-mac-64-nopt-t

Amanieu · 2016-04-02T23:27:45Z

Fixed the test

alexcrichton · 2016-04-03T00:19:22Z

@bors: r+ d96bacce0752868994e168dcdd8b7e0d9f934f35

bors · 2016-04-03T14:05:56Z

⌛ Testing commit d96bacc with merge 8bbd3d5...

bors · 2016-04-03T15:58:58Z

💔 Test failed - auto-linux-64-opt-mir

eddyb · 2016-04-03T20:52:15Z

@Amanieu ah, you're hitting the issue where MIR lacked precise spans. Now they're there, but not used.
If you want to fix it, have trans_intrinsic_call take a span: Span argument instead of extracting it from call_debug_location, and pass data.terminator().span for that argument, from MirContext::trans_block.
You can then also remove #[rustc_no_mir] from src/test/compile-fail/simd-intrinsic-*.rs.
Alternatively, you can just do what I did in those tests and we'll fix this when we implement debuginfo for MIR.

Amanieu · 2016-04-03T21:11:47Z

@eddyb I went with the easy option for now...

eddyb · 2016-04-03T22:02:45Z

You need #[feature(rustc_attrs)] to use this attribute.

Oops, fixed.

eddyb · 2016-04-03T22:16:49Z

@bors r+

bors · 2016-04-03T22:16:50Z

📌 Commit 8620bba has been approved by eddyb

bors · 2016-04-04T00:48:41Z

⌛ Testing commit 8620bba with merge f8ad947...

@eddyb

Only allow using the atomic intrinsics on integer types Using these with non-integer types results in LLVM asserts. Atomic operations on non-integer types will require values be transmuted into an integer type of suitable size. This doesn't affect the standard library since `AtomicBool` and `AtomicPtr` currently use `usize` for atomic operations. r? @eddyb

bors · 2016-04-04T03:09:46Z

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

eddyb · 2016-04-04T03:12:01Z

@bors p=1 retry

eddyb · 2016-04-04T03:12:46Z

@bors force
Looks like a timeout. Doing this to avoid building everything again.

bors · 2016-04-04T03:13:01Z

⚡ Previous build results for auto-linux-32-nopt-t, auto-linux-32-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-64-x-freebsd, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-64-nopt-t, auto-mac-ios-opt, 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-64-opt, auto-win-msvc-64-opt-rustbuild are reusable. Rebuilding only auto-linux-64-debug-opt, auto-linux-64-x-armhf, auto-linux-64-x-armsf, auto-linux-64-x-netbsd, auto-mac-32-opt, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-msvc-32-opt, auto-win-msvc-64-opt-mir...

bors · 2016-04-04T14:07:41Z

💥 Test timed out

alexcrichton · 2016-04-04T16:14:45Z

@bors: retry clean

bors · 2016-04-04T18:36:25Z

⌛ Testing commit 8620bba with merge b207e22...

bors · 2016-04-04T18:41:00Z

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

alexcrichton · 2016-04-04T18:46:13Z

@bors: retry

On Mon, Apr 4, 2016 at 11:41 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-msvc-64-opt-rustbuild
http://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-rustbuild/builds/582
—
You are receiving this because you commented.
Reply to this email directly or view it on GitHub
#32647 (comment)

bors · 2016-04-04T22:09:41Z

⌛ Testing commit 8620bba with merge 144f980...

alexcrichton · 2016-04-04T22:22:25Z

@bors: retry force clean

bors · 2016-04-04T22:37:31Z

⌛ Testing commit 8620bba with merge 600dc35...

@eddyb

Only allow using the atomic intrinsics on integer types Using these with non-integer types results in LLVM asserts. Atomic operations on non-integer types will require values be transmuted into an integer type of suitable size. This doesn't affect the standard library since `AtomicBool` and `AtomicPtr` currently use `usize` for atomic operations. r? @eddyb

bors · 2016-04-05T02:01:09Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, 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-64-x-armhf, auto-linux-64-x-armsf, auto-linux-64-x-freebsd, auto-linux-64-x-netbsd, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-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-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

rust-highfive assigned eddyb Mar 31, 2016

Amanieu force-pushed the checked_atomic_intrinsics branch from b572125 to 9cc968aCompare March 31, 2016 14:28

Amanieu force-pushed the checked_atomic_intrinsics branch from 9cc968a to 2f492d8Compare March 31, 2016 14:55

Only allow using the atomic intrinsics on integer types
78eae9b

Amanieu force-pushed the checked_atomic_intrinsics branch from 2f492d8 to c3668f9Compare March 31, 2016 15:03

Manishearth mentioned this pull request Apr 1, 2016
Rollup of 11 pull requests #32666
Merged

bors added a commit that referenced this pull request Apr 2, 2016
Auto merge of#32666- Manishearth:rollup, r=Manishearth
18172d1
Rollup of 11 pull requests - Successful merges: #32622, #32629, #32640, #32641, #32642, #32645, #32647, #32649, #32652, #32654, #32656 - Failed merges:

Amanieu force-pushed the checked_atomic_intrinsics branch from c3668f9 to d96baccCompare April 2, 2016 23:27

Amanieu force-pushed the checked_atomic_intrinsics branch from d96bacc to 598e122Compare April 3, 2016 21:11

eddyb reviewed Apr 3, 2016
View reviewed changes

Add compile-fail test
8620bba

Amanieu force-pushed the checked_atomic_intrinsics branch from 598e122 to 8620bbaCompare April 3, 2016 22:14

bors merged commit 8620bba into rust-lang:masterApr 5, 2016

This was referenced May 12, 2016
translate undefined intrinsics to an unreachable and a lint rust-lang/rfcs#1478
Closed
Generic atomic v2 rust-lang/rfcs#1477
Closed

Uh oh!

Uh oh!

Conversation

Amanieu commented Mar 31, 2016

Uh oh!

eddyb commented Mar 31, 2016

Uh oh!

Amanieu commented Mar 31, 2016

Uh oh!

Amanieu commented Mar 31, 2016

Uh oh!

Amanieu commented Mar 31, 2016

Uh oh!

eddyb commented Mar 31, 2016

Uh oh!

bors commented Mar 31, 2016

Uh oh!

bors commented Apr 2, 2016

Uh oh!

bors commented Apr 2, 2016

Uh oh!

Amanieu commented Apr 2, 2016

Uh oh!

alexcrichton commented Apr 3, 2016

Uh oh!

bors commented Apr 3, 2016

Uh oh!

bors commented Apr 3, 2016

Uh oh!

eddyb commented Apr 3, 2016

Uh oh!

Amanieu commented Apr 3, 2016

Uh oh!

eddybApr 3, 2016

Choose a reason for hiding this comment

Uh oh!

AmanieuApr 3, 2016

Choose a reason for hiding this comment

Uh oh!

eddyb commented Apr 3, 2016

Uh oh!

bors commented Apr 3, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

eddyb commented Apr 4, 2016

Uh oh!

eddyb commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

alexcrichton commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

alexcrichton commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

alexcrichton commented Apr 4, 2016

Uh oh!

bors commented Apr 4, 2016

Uh oh!

bors commented Apr 5, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants