Skip to content

fix ICE on specific malformed asm clobber_abi - #112683

Merged
bors merged 1 commit into
rust-lang:masterfrom
asquared31415:asm_clobber_ice
Jun 17, 2023
Merged

fix ICE on specific malformed asm clobber_abi#112683
bors merged 1 commit into
rust-lang:masterfrom
asquared31415:asm_clobber_ice

Conversation

@asquared31415

@asquared31415asquared31415 commented Jun 15, 2023

Copy link
Copy Markdown
Contributor

fixes#112635

@rustbot

rustbot commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

r? @TaKO8Ki

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 15, 2023
@asquared31415
asquared31415 marked this pull request as ready for review June 15, 2023 21:49
compiler-errors
compiler-errors reviewed Jun 15, 2023
View reviewed changes
Comment threadtests/ui/asm/invalid_clobber_abi.rs Outdated

@compiler-errorscompiler-errorsJun 15, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can you do clobber_abi() without any args too?

@asquared31415asquared31415Jun 15, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

There's a test in the x86_64 specific tests that handles this:

rust/tests/ui/asm/x86_64/parse-error.rs

Lines 41 to 42 in 331249a

asm!("", clobber_abi());
//~^ ERROR at least one abi must be provided

@asquared31415asquared31415Jun 15, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

hm now that I think about it, that file should be brought out to the main asm tests and this file's contents added to it

@compiler-errors

compiler-errors commented Jun 15, 2023

Copy link
Copy Markdown
Contributor

r=me with one additional example (unless there's already a ui test that excersies this behavior somewhere)

r? @compiler-errors@bors delegate+

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

✌️ @asquared31415, you can now approve this pull request!

If @compiler-errors told you to "r=me" after making some further change, please make that change, then do @bors r=@compiler-errors

@asquared31415

asquared31415 commented Jun 15, 2023

Copy link
Copy Markdown
ContributorAuthor

@bors r=compiler-errors

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit e8824d6 has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors 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 Jun 15, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 16, 2023
@Dylan-DPC
Rollup merge ofrust-lang#112683- asquared31415:asm_clobber_ice, r=c…
d2836a4
…ompiler-errors
fix ICE on specific malformed asm clobber_abi
fixesrust-lang#112635
@Dylan-DPCDylan-DPC mentioned this pull request Jun 16, 2023
Closed
@Dylan-DPC

Dylan-DPC commented Jun 16, 2023

Copy link
Copy Markdown
Member

failed in rollup

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 16, 2023
@asquared31415

asquared31415 commented Jun 16, 2023

Copy link
Copy Markdown
ContributorAuthor

@bors r=compiler-errors

@bors

bors commented Jun 16, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 1fcb0c74f9549207d35cd85675f3c221012ef982 has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 16, 2023
compiler-errors
compiler-errors reviewed Jun 16, 2023
View reviewed changes
Comment threadtests/ui/asm/x86_64/x86_64_parse_error.rs Outdated
@compiler-errors

compiler-errors commented Jun 16, 2023

Copy link
Copy Markdown
Contributor

thank

@bors r+

@bors

bors commented Jun 16, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 3dc793e has been approved by compiler-errors

It is now in the queue for this repository.

@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 17, 2023
@bors
Auto merge ofrust-lang#112739- matthiaskrgr:rollup-8cfggml, r=matth…
e1c29d1
…iaskrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#112352 (Fix documentation build on FreeBSD)
- rust-lang#112644 (Correct types in method descriptions of `NonZero*` types)
- rust-lang#112683 (fix ICE on specific malformed asm clobber_abi)
- rust-lang#112707 ([rustdoc] Fix invalid handling of "going back in history" when "go to only search result" setting is enabled)
- rust-lang#112719 (Replace fvdl with ffx, allow test without install)
- rust-lang#112728 (Add `<meta charset="utf-8">` to `-Zdump-mir-spanview` output)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 7051c84 into rust-lang:masterJun 17, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 17, 2023
@asquared31415
asquared31415 deleted the asm_clobber_ice branch June 22, 2023 01:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errorscompiler-errors

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

ice: asm: unreachable

6 participants

@asquared31415@rustbot@compiler-errors@bors@Dylan-DPC@TaKO8Ki