Skip to content

/rust

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

trans: Re-enable unwinding on 64-bit MSVC #27676

Merged
merged 1 commit into from Aug 12, 2015

Conversation

Reviewers
No reviews
Assignees

@brson brson

Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@alexcrichton @rust-highfive @jroesch @brson @bors @vadimcn
@alexcrichton
Copy link
Member

alexcrichton commented Aug 11, 2015

This commit leverages the runtime support for DWARF exception info added
in #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 #27438)

@rust-highfive rust-highfive assigned jroesch Aug 11, 2015

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Aug 11, 2015

r? @jroesch

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

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Aug 11, 2015

r? @brson

cc #25869, this doesn't close it and I'll update that issue to explain our 32-bit story once this merges

@rust-highfive rust-highfive assigned brson and unassigned jroesch Aug 11, 2015

@alexcrichton alexcrichton force-pushed the alexcrichton:msvc-unwind branch from 5360e41 to 457e40c Aug 11, 2015

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Aug 11, 2015

cc @vadimcn
@jroesch

This comment has been minimized.

Sign in to view
Copy link
Member

jroesch commented Aug 11, 2015

👍 sweet
src/librustc_trans/trans/base.rs Outdated
/// This is only true for MSVC targets, and even then the 64-bit MSVC target
/// currently uses SEH-ish unwinding with DWARF info tables to the side (same as
/// 64-bit MinGW) instead of "full SEH".
pub fn wants_seh(sess: &Session) -> bool {

This comment has been minimized.

Sign in to view
Copy link
@vadimcn

vadimcn Aug 11, 2015

Contributor

I find this nomenclature confusing: the format of LSDA is not a part of the SEH spec, so both -gnu and -msvc are "full SEH". I think this should be called wants_msvc_lsda, or at least wants_msvc_seh.

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton Aug 11, 2015

Author Member

Sounds good to me!
@alexcrichton
trans: Re-enable unwinding on 64-bit MSVC 
This commit leverages the runtime support for DWARF exception info added
in #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 #27438)
Loading status checks…
b6b4f5a

@alexcrichton alexcrichton force-pushed the alexcrichton:msvc-unwind branch from 457e40c to b6b4f5a Aug 11, 2015

@brson

This comment has been minimized.

Sign in to view
Copy link
Contributor

brson commented Aug 12, 2015

@bors r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Aug 12, 2015

📌 Commit b6b4f5a has been approved by brson

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Aug 12, 2015

@alexcrichton
rollup merge of rust-lang#27676: alexcrichton/msvc-unwind 
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)
777ebea

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Aug 12, 2015

@alexcrichton
rollup merge of rust-lang#27676: alexcrichton/msvc-unwind 
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)
bbef889

@bors bors merged commit b6b4f5a into rust-lang:master Aug 12, 2015
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@alexcrichton alexcrichton deleted the alexcrichton:msvc-unwind branch Aug 13, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.