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.

Sign up for GitHub

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

Jump to bottom

Correct ICE caused by macros generating invalid spans. #68611

Merged
merged 1 commit into from
Jan 29, 2020
Merged

Correct ICE caused by macros generating invalid spans. #68611

merged 1 commit into from
Jan 29, 2020

Conversation

MichaelBurge
Copy link
Contributor

Closes #68605

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 28, 2020
@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 28, 2020
@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jan 28, 2020

📌 Commit 79d8c9b has been approved by estebank

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2020
@petrochenkov
Copy link
Contributor

r? @estebank

@Centril
Copy link
Contributor

Centril commented Jan 28, 2020

Shouldn't this come with a regression test?

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 29, 2020
@JohnTitor
Rollup merge of rust-lang#68611 - MichaelBurge:master, r=estebank
0e36558 
Correct ICE caused by macros generating invalid spans.

Closes rust-lang#68605
@JohnTitor JohnTitor mentioned this pull request Jan 29, 2020
Merged
bors added a commit that referenced this pull request Jan 29, 2020
@bors
Auto merge of #68635 - JohnTitor:rollup-jsc34ac, r=JohnTitor
eed12bc 
Rollup of 7 pull requests

Successful merges:

 - #67722 (Minor: note how Any is an unsafe trait in SAFETY comments)
 - #68586 (Make conflicting_repr_hints a deny-by-default c-future-compat lint)
 - #68598 (Fix null synthetic_implementors error)
 - #68603 (Changelog: Demonstrate final build-override syntax)
 - #68609 (Set lld flavor for MSVC to link.exe)
 - #68611 (Correct ICE caused by macros generating invalid spans.)
 - #68627 (Document that write_all will not call write if given an empty buffer)

Failed merges:

r? @ghost
@bors bors merged commit 79d8c9b into rust-lang:master Jan 29, 2020
@pnkfelix
Copy link
Member

pnkfelix commented Feb 6, 2020

(we discussed backporting this in today's T-compiler meeting. We are not certain what warn! will do here, in terms of what an end-user will see, so we held off on approving this change until after we've double-checked the default UX there...)

@nikomatsakis nikomatsakis added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Feb 13, 2020
@nikomatsakis
Copy link
Contributor

Discussed in today's T-compiler meeting. Inserting a warn! still seems unusual to me personally, but we decided to go ahead and approve for beta/stable backport, since it does correct an ICE, and the patch seems harmless enough.

@LeSeulArtichaut LeSeulArtichaut mentioned this pull request Feb 21, 2020
Closed
@Mark-Simulacrum Mark-Simulacrum removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Feb 21, 2020
This was referenced Feb 21, 2020
Merged
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 21, 2020
bors added a commit that referenced this pull request Feb 22, 2020
@bors
Auto merge of #69359 - Mark-Simulacrum:stable-next, r=<try>
9ab2cd6 
[stable] 1.41.1 release

This backports the following PRs:
 * Revert "Remove `checked_add` in `Layout::repeat`" #69241
 * Do not ICE when encountering `yield` inside `async` block #69175
 * Correct ICE caused by macros generating invalid spans. #68611
 * Changelog: Demonstrate final build-override syntax #68603
 * Resolve long compile times when evaluating always valid constants #67667
 * Fix MIR typeck soundness holes #69145

This also includes a commit which rustfmt's files which the latter commits touched (and perhaps a bit more) to make rebasing the PRs go more smoothly (thankfully, this should be the last time we need to do so).

I have removed stable-nominated tags from PRs successfully backported.
bors added a commit that referenced this pull request Feb 24, 2020
@bors
Auto merge of #69359 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
ded0270 
[stable] 1.41.1 release

This backports the following PRs:
 * Revert "Remove `checked_add` in `Layout::repeat`" #69241
 * Do not ICE when encountering `yield` inside `async` block #69175
 * Correct ICE caused by macros generating invalid spans. #68611
 * Changelog: Demonstrate final build-override syntax #68603
 * Resolve long compile times when evaluating always valid constants #67667
 * Fix MIR typeck soundness holes #69145

This also includes a commit which rustfmt's files which the latter commits touched (and perhaps a bit more) to make rebasing the PRs go more smoothly (thankfully, this should be the last time we need to do so).

I have removed stable-nominated tags from PRs successfully backported.
bors added a commit that referenced this pull request Feb 24, 2020
@bors
Auto merge of #69360 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
13e0fbc 
[beta] beta backports

This backports the following PRs:

* Revert "Remove `checked_add` in `Layout::repeat`" #69241
* Do not ICE when encountering `yield` inside `async` block #69175
* Fix MIR typeck soundness holes #69145
* Fix extra subslice lowering #69128
* Correct ICE caused by macros generating invalid spans. #68611
* Make conflicting_repr_hints a deny-by-default c-future-compat lint #68586
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estebank estebank Awaiting requested review from estebank

Assignees

@estebank estebank

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. stable-accepted Accepted for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Compiler gives internal error during macro expansion.
9 participants
@MichaelBurge @rust-highfive @estebank @bors @petrochenkov @Centril @pnkfelix @nikomatsakis @Mark-Simulacrum