rustc_trans: apply the debug location for the MIR Assert panic call. #35141
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) |
| @@ -284,6 +284,7 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> { | |||
|
|
|||
| // After this point, bcx is the block for the call to panic. | |||
| bcx = panic_block.build(); | |||
| debug_loc.apply_to_bcx(&bcx); | |||
There was a problem hiding this comment.
I feel like this is a fairly easy stuff to overlook. I skimmed the context and haven’t found any more obvious instances of such mistake, but I feel like it is considerably easy to make similar mistake at any point in the future.
Perhaps we should consider making a wrapper of some sort for fcx.new_block?
There was a problem hiding this comment.
When old trans is gone, we can have a simpler and less error-prone interface, i.e. a Block that always knows its debug position.
|
r=me, but I have a feeling that I will see a similar PR at some time in the future again. |
|
@bors r=nagisa rollup |
|
📌 Commit d1f341d has been approved by |
sanxiyn
added a commit
to sanxiyn/rust
that referenced
this pull request
Aug 1, 2016
rustc_trans: apply the debug location for the MIR Assert panic call.
Helps `libcore` build with MIR trans and debuginfo; libcore has the body of `panic`, which resulted in:
```
inlinable function call in a function with debug info must have a !dbg location
call void @_ZN4core9panicking5panic17h585bd70cda921012E({ %str_slice, %str_slice, i32 }* @panic_loc12745)
LLVM ERROR: Broken function found, compilation aborted!
```
bors
added a commit
that referenced
this pull request
Aug 1, 2016
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.
Helps
libcorebuild with MIR trans and debuginfo; libcore has the body ofpanic, which resulted in: