Fix emitting asm and object file output at the same time #29385
Closed
+48
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
| @@ -244,11 +245,17 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target, | |||
| return false; | |||
| } | |||
|
|
|||
| // Use a pass ID that doesn't identify any pass, so all the codegen passes | |||
| // are skipped. This lets us output both asm and obj files from the same LLVM | |||
| // module in a single run. | |||
There was a problem hiding this comment.
Could you expand this comment a bit to explain why this is here at all?
|
Could a run-pass test also be added to ensure this doesn't regress? |
The LLVM function to output file types that involve codegen can invalidate the IR while lowering. That means that the second time the IR is fed to those passes, it's invalid and the LLVM verifier complains. To workaround this, we can tell the function to skip the codegen passes the second time around. To do this, we tell it to start adding passes only after it has seen a pass that doesn't exist at all. Quite the hack, I know... Fixes rust-lang#24876
|
Updated |
|
⌛ Testing commit b90aa66 with merge 1d5948b... |
|
💔 Test failed - auto-win-gnu-32-nopt-t |
|
Closing due to inactivity, but feel free to resubmit! (r=me if so) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The LLVM function to output file types that involve codegen can
invalidate the IR while lowering. That means that the second time the IR
is fed to those passes, it's invalid and the LLVM verifier complains. To
workaround this, we can tell the function to skip the codegen passes the
second time around. To do this, we tell it to start adding passes only
after it has seen a pass that doesn't exist at all. Quite the hack, I
know...
Fixes #24876