Skip to content

Switch to begin_panic again#43477

Merged
bors merged 1 commit into
rust-lang:masterfrom
est31:master
Jul 27, 2017
Merged

Switch to begin_panic again#43477
bors merged 1 commit into
rust-lang:masterfrom
est31:master

Conversation

@est31

@est31 est31 commented Jul 25, 2017

Copy link
Copy Markdown
Member

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
Copy Markdown
Contributor

r? @alexcrichton

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

@est31

est31 commented Jul 25, 2017

Copy link
Copy Markdown
Member Author

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
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 25, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 90ac640 has been approved by alexcrichton

@bors

bors commented Jul 27, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Jul 27, 2017

Copy link
Copy Markdown
Collaborator

☀️ 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.

4 participants