fix MIR fn-ptr pretty-printing #82176
Merged
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
oli-obk
requested changes
Feb 17, 2021
| " as ", | ||
| )?; | ||
| } | ||
| Some(_) => p!("<non-executable memory>"), |
There was a problem hiding this comment.
I think we should just print the pointer as if it were a raw pointer here, otherwise we lose information that may be helpful in debugging the situation.
There was a problem hiding this comment.
You mean like this? (I don't actually know what I am doing here, as said before, this code is rather confusing.^^)
|
@bors r+ rollup yea this looks correct. I have no idea how to test this either, as we'd need to disable validation in order to ever show this in a regular MIR dump |
|
📌 Commit e906745 has been approved by |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 20, 2021
fix MIR fn-ptr pretty-printing
An uninitialized function pointer would get printed as `{{uninit fn()}` (notice the unbalanced parentheses), and a dangling fn ptr would ICE. This fixes both of that.
However, I have no idea how to add tests for this.
Also, I don't understand this MIR pretty-printing code. Somehow the print function `pretty_print_const_scalar` actually *returns* a transformed form of the const (but there is no doc comment explaining what is being returned); some match arms do `p!` while others do `self =`, and there's a wild mixture of `p!` and `write!`... all very mysterious and confusing.^^
r? `@oli-obk`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 20, 2021
…laumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#80595 (`impl PartialEq<Punct> for char`; symmetry for rust-lang#78636) - rust-lang#81991 (Fix panic in 'remove semicolon' when types are not local) - rust-lang#82176 (fix MIR fn-ptr pretty-printing) - rust-lang#82244 (Keep consistency in example for Stdin StdinLock) - rust-lang#82260 (rustc: Show ``@path`` usage in stable) - rust-lang#82316 (Fix minor mistake in LTO docs.) - rust-lang#82332 (Don't generate src link on dummy spans) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
An uninitialized function pointer would get printed as
{{uninit fn()}(notice the unbalanced parentheses), and a dangling fn ptr would ICE. This fixes both of that.However, I have no idea how to add tests for this.
Also, I don't understand this MIR pretty-printing code. Somehow the print function
pretty_print_const_scalaractually returns a transformed form of the const (but there is no doc comment explaining what is being returned); some match arms dop!while others doself =, and there's a wild mixture ofp!andwrite!... all very mysterious and confusing.^^r? @oli-obk