Implement Win64 eh_personality natively. by vadimcn · Pull Request #27210 · rust-lang/rust

vadimcn · 2015-07-22T09:19:09Z

After this change, the only remaining symbol we are pulling from libgcc on Win64 is __chkstk_ms - the stack probing routine.

rust-highfive · 2015-07-22T09:19:22Z

r? @brson

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

vadimcn · 2015-07-22T09:23:10Z

I am not quite happy about the way rust_eh_unwind_resume get linked. It should have probably been a lang item, but I couldn't quite figure out how to plumb it through to LLVMRustHookUnwindResume...

vadimcn · 2015-07-22T09:23:52Z

r? @alexcrichton

bors · 2015-07-22T12:52:31Z

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

nagisa · 2015-07-22T17:38:50Z

Wording of this sentence somehow seems to suggest GCC personality function and _Unwind_Resume come from two different locations, while in practice they both come from libgcc.

alexcrichton · 2015-07-22T22:22:39Z

Nice work @vadimcn!

liigo · 2015-07-23T02:42:19Z

RST also refers to reStructuredText. How about we use .rs here?
const MAGIC: DWORD = 0x2e7273; // ".rs"

brson · 2015-07-23T21:54:17Z

Epic patch.

vadimcn · 2015-07-24T09:29:12Z

Addressed comments and rebased on top of master. r?

alexcrichton · 2015-07-24T17:26:25Z

s/x86/i686/

vadimcn · 2015-08-02T06:16:27Z

Works now. r?

alexcrichton · 2015-08-02T18:32:22Z

@bors: r+

bors · 2015-08-02T18:32:22Z

📌 Commit e493027 has been approved by alexcrichton

bors · 2015-08-02T18:41:31Z

⌛ Testing commit e493027 with merge 2c60a05...

bors · 2015-08-02T19:08:20Z

💔 Test failed - auto-linux-64-x-android-t

Gankra · 2015-08-02T19:17:28Z

Seems legit:


../src/libstd/rt/unwind/gcc.rs:231:38: 231:43 error: use of moved
value: `state` [E0382]
../src/libstd/rt/unwind/gcc.rs:231
__gcc_personality_v0(state, ue_header, context)
^~~~~
../src/libstd/rt/unwind/gcc.rs:225:13: 225:18 note: `state` moved here
because it has type `rt::libunwind::_Unwind_State`, which is
non-copyable
../src/libstd/rt/unwind/gcc.rs:225 if (state as c_int &
uw::_US_ACTION_MASK as c_int)
^~~~~
error: aborting due to previous error
make: *** [x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib/stamp.std]
Error 101
make: *** Waiting for unfinished jobs....

On Sun, Aug 2, 2015 at 12:08 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-linux-64-x-android-t
http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/5916
—
Reply to this email directly or view it on GitHub
#27210 (comment).

vadimcn · 2015-08-03T05:04:55Z

Fixed. Let's try again?

alexcrichton · 2015-08-03T17:33:59Z

@bors: r+ 96d1db2

bors · 2015-08-03T17:35:30Z

⌛ Testing commit 96d1db2 with merge d99b3c5...

bors · 2015-08-03T17:37:35Z

💔 Test failed - auto-mac-64-opt

alexcrichton · 2015-08-03T18:11:49Z

@bors: retry

On Mon, Aug 3, 2015 at 10:37 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-mac-64-opt
http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5957
—
Reply to this email directly or view it on GitHub
#27210 (comment).

After this change, the only remaining symbol we are pulling from libgcc on Win64 is `__chkstk_ms` - the stack probing routine.

bors · 2015-08-03T22:12:47Z

⌛ Testing commit 96d1db2 with merge ceded6a...

bors · 2015-08-03T23:47:00Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

alexcrichton · 2015-08-03T23:49:09Z

🎊

This commit leverages the runtime support for DWARF exception info added in rust-lang#27210 to enable unwinding by default on 64-bit MSVC. This also additionally adds a few minor fixes here and there in the test harness and such to get `make check` entirely passing on 64-bit MSVC: * The invocation of `maketest.py` now works with spaces/quotes in CC * debuginfo tests are disabled on MSVC * A link error for librustc was hacked around (see rust-lang#27438)

rust-highfive assigned brson Jul 22, 2015

rust-highfive assigned alexcrichton and unassigned brson Jul 22, 2015

nagisa reviewed Jul 22, 2015
View reviewed changes

liigo reviewed Jul 23, 2015
View reviewed changes

brson added the relnotes Marks issues that should be documented in the release notes of the next release. label Jul 23, 2015

vadimcn force-pushed the win64-eh-pers branch 2 times, most recently from 502a189 to 59d5b19Compare July 24, 2015 09:28

vadimcn force-pushed the win64-eh-pers branch from 59d5b19 to 63049c7Compare July 24, 2015 09:44

alexcrichton reviewed Jul 24, 2015
View reviewed changes

Comment threadsrc/libstd/rt/unwind/mod.rs Outdated
alexcrichtonJul 24, 2015
Copy link
Copy Markdown
Member
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/x86/i686/

Fix compile errors for ARM.
96d1db2

bors added a commit that referenced this pull request Aug 3, 2015
Auto merge of#27210- vadimcn:win64-eh-pers, r=alexcrichton
ceded6a
After this change, the only remaining symbol we are pulling from libgcc on Win64 is `__chkstk_ms` - the stack probing routine.

bors merged commit 96d1db2 into rust-lang:masterAug 3, 2015

This was referenced Aug 3, 2015
rustc: Allow changing the default allocator #27400
Merged
Improve handling of dllexport #27416
Merged
Port Rust to PNaCl/JS (rebase #1) #26505
Closed

alexcrichton mentioned this pull request Aug 11, 2015
trans: Re-enable unwinding on 64-bit MSVC #27676
Merged

vadimcn deleted the win64-eh-pers branch October 9, 2015 05:15

Uh oh!

Uh oh!

Conversation

vadimcn commented Jul 22, 2015

Uh oh!

rust-highfive commented Jul 22, 2015

Uh oh!

vadimcn commented Jul 22, 2015

Uh oh!

vadimcn commented Jul 22, 2015

Uh oh!

bors commented Jul 22, 2015

Uh oh!

nagisaJul 22, 2015

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jul 22, 2015

Uh oh!

liigoJul 23, 2015

Choose a reason for hiding this comment

Uh oh!

brson commented Jul 23, 2015

Uh oh!

vadimcn commented Jul 24, 2015

Uh oh!

alexcrichtonJul 24, 2015

Choose a reason for hiding this comment

Uh oh!

vadimcn commented Aug 2, 2015

Uh oh!

alexcrichton commented Aug 2, 2015

Uh oh!

bors commented Aug 2, 2015

Uh oh!

bors commented Aug 2, 2015

Uh oh!

bors commented Aug 2, 2015

Uh oh!

Gankra commented Aug 2, 2015

Uh oh!

vadimcn commented Aug 3, 2015

Uh oh!

alexcrichton commented Aug 3, 2015

Uh oh!

bors commented Aug 3, 2015

Uh oh!

bors commented Aug 3, 2015

Uh oh!

alexcrichton commented Aug 3, 2015

Uh oh!

bors commented Aug 3, 2015

Uh oh!

bors commented Aug 3, 2015

Uh oh!

alexcrichton commented Aug 3, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants