Implement rust_eh_personality in Rust, remove rust_eh_personality_catch. #34832

vadimcn · 2016-07-15T07:26:58Z

Well, not quite: ARM EHABI platforms still use the old scheme -- for now.

vadimcn · 2016-07-15T07:27:32Z

bors · 2016-07-15T15:49:21Z

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

vadimcn · 2016-07-15T16:54:58Z

@vhbit: I hope I got SjLj stuff right.

alexcrichton · 2016-07-15T21:20:35Z

src/librustc_trans/intrinsic.rs

-        let catch_pers = match tcx.lang_items.eh_personality_catch() {
-            Some(did) => {
-                Callee::def(ccx, did, tcx.mk_substs(Substs::empty())).reify(ccx).val
+        let catch_pers = if cfg!(all(target_arch = "arm", not(target_os = "ios"))) {


I think this needs to be looking at sess rather than cfg! (otherwise this'll always return false)

alexcrichton · 2016-07-15T21:41:00Z

Awesome work @vadimcn! This looks quite solid.

vadimcn · 2016-07-15T22:59:43Z

r?

alexcrichton · 2016-07-16T17:17:20Z

Looks good to me, but the travis test failure looks worrisome?

vadimcn · 2016-07-16T18:10:46Z

but the travis test failure looks worrisome?

It does, but all tests pass locally (Linux 64, OSX 64 and Windows 64). I'd have liked to run this PR on try...

alexcrichton · 2016-07-16T20:52:40Z

Eh let's send it to bors and see what happens

@bors: r+

bors · 2016-07-16T20:52:41Z

📌 Commit a06e308 has been approved by alexcrichton

alexcrichton · 2016-07-16T20:52:55Z

Good way to get coverage at least!

vadimcn · 2016-07-16T22:36:43Z

Huh, since when you don't need to provide a commit hash with r+ ?

alexcrichton · 2016-07-17T00:44:35Z

Oh I believe that's actually always been the case, I just personally prefer to put the hash most of the time.

bors · 2016-07-17T13:03:39Z

⌛ Testing commit a06e308 with merge 761def0...

bors · 2016-07-17T14:04:53Z

💔 Test failed - auto-win-gnu-32-opt-rustbuild

rillian · 2016-07-19T02:35:14Z

This does fix the linker assertion we get on MacOS X debug gecko builds. Thanks for working on this!

alexcrichton · 2016-07-19T03:51:09Z

Ah and just to clarify the associated bug is this. @vadimcn looks like the failure here may be legitimate?

vadimcn · 2016-07-19T06:49:51Z

looks like the failure here may be legitimate?

Yes, looks like it. For whatever reason, LLVM decides that __rust_start_unwind is a "nounwind" function. But only on Windows and only with -O -Clto.
...Which causes it to not emit unwind info in its caller, which the new personality routine detects and aborts. I think the was happening for some time now, but the old code was more lenient in this case.

alexcrichton · 2016-07-19T07:17:47Z

Oh I think that extern functions are by default marked nounwind and it looks like I forgot to tag __rust_start_panic as such. I think that #[unwind] is all we need on that function?

bors · 2016-07-22T21:31:46Z

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

arielb1 · 2016-07-22T21:44:58Z

@bors retry

arielb1 · 2016-07-22T21:45:41Z

Eh no

@bors r-

rustc: x86_64-pc-windows-gnu/stage0/lib/rustlib/x86_64-pc-windows-gnu/lib/libpanic_unwind
../src/libpanic_unwind\seh64_gnu.rs:141:9: 141:19 error: structure `dwarf::eh::EHContext<'_>` has no field named `text_start`
../src/libpanic_unwind\seh64_gnu.rs:141         text_start: dc.ImageBase as usize,
                                                ^~~~~~~~~~
../src/libpanic_unwind\seh64_gnu.rs:141:9: 141:19 help: did you mean `get_text_start`?
../src/libpanic_unwind\seh64_gnu.rs:141         text_start: dc.ImageBase as usize,
                                                ^~~~~~~~~~
../src/libpanic_unwind\seh64_gnu.rs:142:9: 142:19 error: structure `dwarf::eh::EHContext<'_>` has no field named `data_start`
../src/libpanic_unwind\seh64_gnu.rs:142         data_start: 0,
                                                ^~~~~~~~~~
../src/libpanic_unwind\seh64_gnu.rs:142:9: 142:19 help: did you mean `get_data_start`?
../src/libpanic_unwind\seh64_gnu.rs:142         data_start: 0,
                                                ^~~~~~~~~~

Well, not quite: ARM EHABI platforms still use the old scheme -- for now.

vadimcn · 2016-07-22T22:00:04Z

Forgot to update Windows code...

vadimcn · 2016-07-22T22:00:15Z

@bors: r=alexcrichton

bors · 2016-07-22T22:00:15Z

📌 Commit 051c2d1 has been approved by alexcrichton

bors · 2016-07-22T22:01:08Z

⌛ Testing commit 051c2d1 with merge 5bd4e21...

bors · 2016-07-22T22:38:26Z

💔 Test failed - auto-linux-64-opt

arielb1 · 2016-07-22T22:45:08Z

@bors retry

bors · 2016-07-22T23:09:05Z

⌛ Testing commit 051c2d1 with merge 0fab347...

bors · 2016-07-22T23:11:29Z

💔 Test failed - auto-win-gnu-32-opt

alexcrichton · 2016-07-22T23:18:00Z

@bors: retry

On Fri, Jul 22, 2016 at 4:11 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-gnu-32-opt
https://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt/builds/5039

—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
#34832 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95GgLTv2MsJeOpLaGOytM-FC1iEKDks5qYU4kgaJpZM4JNJR3
.

bors · 2016-07-23T10:14:39Z

⌛ Testing commit 051c2d1 with merge 1864601...

bors · 2016-07-23T11:01:04Z

💔 Test failed - auto-linux-64-cross-freebsd

arielb1 · 2016-07-23T14:37:35Z

@bors retry

bors · 2016-07-23T14:42:34Z

⌛ Testing commit 051c2d1 with merge 3664f07...

bors · 2016-07-23T15:09:57Z

💔 Test failed - auto-linux-cross-opt

arielb1 · 2016-07-23T16:35:33Z

@bors retry force

bors · 2016-07-23T16:35:35Z

⌛ Testing commit 051c2d1 with merge 2c50f4e...

@alexcrichton

Implement rust_eh_personality in Rust, remove rust_eh_personality_catch. Well, not quite: ARM EHABI platforms still use the old scheme -- for now. r? @alexcrichton

bors · 2016-07-23T20:00:23Z

rust-highfive assigned alexcrichton Jul 15, 2016

vadimcn force-pushed the rusty-personality branch from 0c40455 to f132327 Compare July 15, 2016 16:48

alexcrichton reviewed Jul 15, 2016
View reviewed changes

Implement rust_eh_personality in Rust, remove rust_eh_personality_catch.

051c2d1

Well, not quite: ARM EHABI platforms still use the old scheme -- for now.

vadimcn force-pushed the rusty-personality branch from 01b2b87 to 051c2d1 Compare July 22, 2016 21:59

bors merged commit 051c2d1 into rust-lang:master Jul 23, 2016

TimNN mentioned this pull request Jul 24, 2016

run-pass tests are failing on travis with "fatal runtime error: failed to initiate panic, error 3" #35011

Closed

vadimcn mentioned this pull request Jul 25, 2016

Fix Travis tests #35014

Merged

Implement rust_eh_personality in Rust, remove rust_eh_personality_catch. #34832

Implement rust_eh_personality in Rust, remove rust_eh_personality_catch. #34832

Conversation

vadimcn commented Jul 15, 2016

vadimcn commented Jul 15, 2016

bors commented Jul 15, 2016

vadimcn commented Jul 15, 2016

alexcrichton Jul 15, 2016

Choose a reason for hiding this comment

alexcrichton commented Jul 15, 2016

vadimcn commented Jul 15, 2016

alexcrichton commented Jul 16, 2016

vadimcn commented Jul 16, 2016

alexcrichton commented Jul 16, 2016

bors commented Jul 16, 2016

alexcrichton commented Jul 16, 2016

vadimcn commented Jul 16, 2016

alexcrichton commented Jul 17, 2016

bors commented Jul 17, 2016

bors commented Jul 17, 2016

rillian commented Jul 19, 2016

alexcrichton commented Jul 19, 2016

vadimcn commented Jul 19, 2016

alexcrichton commented Jul 19, 2016

bors commented Jul 22, 2016

arielb1 commented Jul 22, 2016

arielb1 commented Jul 22, 2016

vadimcn commented Jul 22, 2016

vadimcn commented Jul 22, 2016

bors commented Jul 22, 2016

bors commented Jul 22, 2016

bors commented Jul 22, 2016

arielb1 commented Jul 22, 2016

bors commented Jul 22, 2016

bors commented Jul 22, 2016

alexcrichton commented Jul 22, 2016

bors commented Jul 23, 2016

bors commented Jul 23, 2016

arielb1 commented Jul 23, 2016

bors commented Jul 23, 2016

bors commented Jul 23, 2016

arielb1 commented Jul 23, 2016

bors commented Jul 23, 2016

bors commented Jul 23, 2016