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

builtin_macros: Fix use of interpolated identifiers in asm! #77595

Merged
merged 2 commits into from
Oct 7, 2020
Merged

builtin_macros: Fix use of interpolated identifiers in asm! #77595

merged 2 commits into from
Oct 7, 2020

Conversation

petrochenkov
Copy link
Contributor

Fixes #77584

@rust-highfive
Copy link
Collaborator

r? @oli-obk

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2020
@petrochenkov petrochenkov mentioned this pull request Oct 5, 2020
Closed
@jyn514 jyn514 added A-inline-assembly Area: Inline assembly (`asm!(…)`) A-macros Area: All kinds of macros (custom derive, macro_rules!, proc macros, ..) F-asm `#![feature(asm)]` (not `llvm_asm`) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 5, 2020
oli-obk
oli-obk reviewed Oct 6, 2020
View reviewed changes
compiler/rustc_builtin_macros/src/asm.rs Outdated Show resolved Hide resolved
src/test/ui/asm/interpolated-idents.stderr
| ^^^^^^^^^ ^^^^^^^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^
...
LL | m!(in out lateout inout inlateout const sym
| _____-
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh wow... cc @rust-lang/wg-diagnostics we should probably deduplicate span_labels that have the same message and span

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we do this already, but it's intentionally disabled for UI tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Aaron1011
No, with -Z deduplicate-diagnostics=yes the output looks the same.
Full diagnostics (error + all the attached notes and labels) are deduplicated, not individual fragments.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 6, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Oct 7, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2020

📌 Commit 219c66c has been approved by oli-obk

@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 Oct 7, 2020
@bors
Copy link
Contributor

bors commented Oct 7, 2020

⌛ Testing commit 219c66c with merge 533780d38930861f700ce418e654b413b257723a...

@pietroalbini
Copy link
Member

@bors retry

Yielding priority to the stable release.

@bors
Copy link
Contributor

bors commented Oct 7, 2020

⌛ Testing commit 219c66c with merge a14bf48...

@bors
Copy link
Contributor

bors commented Oct 7, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: oli-obk
Pushing a14bf48 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 7, 2020
@bors bors merged commit a14bf48 into rust-lang:master Oct 7, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aaron1011 Aaron1011 Aaron1011 left review comments

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
A-inline-assembly Area: Inline assembly (`asm!(…)`) A-macros Area: All kinds of macros (custom derive, macro_rules!, proc macros, ..) F-asm `#![feature(asm)]` (not `llvm_asm`) merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.

macro_rules-wrapped asm! fails on att_syntax
8 participants
@petrochenkov @rust-highfive @oli-obk @bors @pietroalbini @Aaron1011 @jyn514 @rustbot