Skip to content

make asm diagnostic instruction optional #59242

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Mar 25, 2019
Merged

Conversation

euclio
Copy link
Contributor

@euclio euclio commented Mar 16, 2019

DiagnosticInfoInlineAsm::getInstruction may return a null pointer, so
the instruction shouldn't be blindly unwrapped.

Reopening from #55193. I was unable to trigger the assertion on Windows after rebasing.

Fixes #23458.
Fixes #55216.

@rust-highfive
Copy link
Contributor

r? @cramertj

(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 Mar 16, 2019
@cramertj
Copy link
Member

r? @nagisa

@rust-highfive rust-highfive assigned nagisa and unassigned cramertj Mar 18, 2019
@nagisa
Copy link
Member

nagisa commented Mar 20, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 20, 2019

📌 Commit 8d64f9c52257f328e2c5986f55a2f86157886dac has been approved by nagisa

@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 Mar 20, 2019
@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

@bors r-

This PR caused failure in #59397 (comment). Please restrict the new test on x86 and x86_64 only.

@bors bors 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 Mar 24, 2019
`DiagnosticInfoInlineAsm::getInstruction` may return a null pointer, so
the instruction shouldn't be blindly unwrapped.
@euclio
Copy link
Contributor Author

euclio commented Mar 24, 2019

Added an only-x86_64 directive. The test seemed to always be ignored if I added a only-x86 directive as well.

@kennytm
Copy link
Member

kennytm commented Mar 24, 2019

@bors r=nagisa

@bors
Copy link
Collaborator

bors commented Mar 24, 2019

📌 Commit 4728433 has been approved by nagisa

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 24, 2019
@bors
Copy link
Collaborator

bors commented Mar 25, 2019

⌛ Testing commit 4728433 with merge 3f36ac4...

bors added a commit that referenced this pull request Mar 25, 2019
make asm diagnostic instruction optional

`DiagnosticInfoInlineAsm::getInstruction` may return a null pointer, so
the instruction shouldn't be blindly unwrapped.

Reopening from #55193. I was unable to trigger the assertion on Windows after rebasing.

Fixes #23458.
Fixes #55216.
@bors
Copy link
Collaborator

bors commented Mar 25, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: nagisa
Pushing 3f36ac4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 25, 2019
@bors bors merged commit 4728433 into rust-lang:master Mar 25, 2019
@euclio euclio deleted the asm-ice branch March 25, 2019 18:11
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants