Skip to content
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

Switch to begin_panic again #43477

Merged
merged 1 commit into from
Jul 27, 2017
Merged

Switch to begin_panic again #43477

merged 1 commit into from
Jul 27, 2017

Conversation

est31
Copy link
Member

@est31 est31 commented Jul 25, 2017

In #42938 we made the compiler
emit a call to begin_panic_new in order to pass column info to it. Now
with stage0 updated (#43320),
we can safely change begin_panic and start emitting calls for it again.

In rust-lang#42938 we made the compiler
emit a call to begin_panic_new in order to pass column info to it. Now
with stage0 updated (rust-lang#43320),
we can safely change begin_panic and start emitting calls for it again.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@est31
Copy link
Member Author

est31 commented Jul 25, 2017

I'm not sure whether I could have spared one stage0 update (I have chosen a strategy to update the abi over two stage0 updates) by making a #[cfg(stage0)] version of begin_panic with the old abi and a #[not(cfg(stage0))] version with the new abi. It might have caused issues with proc macros, not sure. In any case, now is too late to switch strategies, we need to wait for a second stage0 update to get rid of the #[cfg(stage0)] stuff that this PR adds.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 25, 2017

📌 Commit 90ac640 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 27, 2017

⌛ Testing commit 90ac640 with merge e574ba4...

bors added a commit that referenced this pull request Jul 27, 2017
Switch to begin_panic again

In #42938 we made the compiler
emit a call to begin_panic_new in order to pass column info to it. Now
with stage0 updated (#43320),
we can safely change begin_panic and start emitting calls for it again.
@bors
Copy link
Contributor

bors commented Jul 27, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing e574ba4 to master...

@bors bors merged commit 90ac640 into rust-lang:master Jul 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants