Fix ICE in MIR pretty printing #59036
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
|
r? @estebank (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
estebank
reviewed
Mar 9, 2019
src/librustc_mir/util/pretty.rs
Outdated
| @@ -597,7 +597,8 @@ fn write_mir_sig( | |||
| trace!("write_mir_sig: {:?}", src.instance); | |||
| let descr = tcx.describe_def(src.def_id()); | |||
| let is_function = match descr { | |||
| Some(Def::Fn(_)) | Some(Def::Method(_)) | Some(Def::StructCtor(..)) => true, | |||
| Some(Def::Fn(_)) | Some(Def::Method(_)) | | |||
| Some(Def::StructCtor(..)) | Some(Def::Variant(..)) => true, | |||
There was a problem hiding this comment.
Have you tested this with a strict style variant?
Are there MIR pretty-print tests?
You mean one without a constructor? E.g. |
Yes, can you add this to |
petrochenkov
reviewed
Mar 9, 2019
src/librustc_mir/util/pretty.rs
Outdated
| @@ -597,7 +597,8 @@ fn write_mir_sig( | |||
| trace!("write_mir_sig: {:?}", src.instance); | |||
| let descr = tcx.describe_def(src.def_id()); | |||
| let is_function = match descr { | |||
| Some(Def::Fn(_)) | Some(Def::Method(_)) | Some(Def::StructCtor(..)) => true, | |||
| Some(Def::Fn(_)) | Some(Def::Method(_)) | | |||
| Some(Def::StructCtor(..)) | Some(Def::Variant(..)) => true, | |||
There was a problem hiding this comment.
You need Def::VariantCtor here rather than Def::Variant, Def::Variant is the "variant type" from type namespace.
Also, only Def::VariantCtor(_, CtorKind::Fn) is a function, same applies to Def::StructCtor.
There was a problem hiding this comment.
Ah, you're right. Good catch
There was a problem hiding this comment.
@petrochenkov Actually I spoke too soon. The ICE is still hit when Def::VariantCtor is used.
I think we end up with the Def::Variant here because in tcx.describe_def there is no arm that will return a VariantCtor. I think we use the same DefId for the ctor and the variant.
There was a problem hiding this comment.
in tcx.describe_def there is no arm that will return a VariantCtor. I think we use the same DefId for the ctor and the variant.
Sigh, ok.
This is not a good situation, but variants sharing def-ids with their constructors is a long standing issue.
|
Added a test and ensures it fails without the patch. |
| @@ -1,12 +1,18 @@ | |||
| // Test that we don't ICE when trying to dump MIR for unusual item types and | |||
| // that we don't create filenames containing `<` and `>` | |||
| // compile-flags: --emit mir | |||
There was a problem hiding this comment.
This shouldn't be needed
There was a problem hiding this comment.
Apparently we don't automatically generate this MIR. Could you add let _ = Test::X as fn(usize) -> Test; to main instead?
There was a problem hiding this comment.
👍 Thanks for the suggestion. This is much cleaner.
| // See #59021 | ||
| pub enum Test { | ||
| X(usize), | ||
| } |
There was a problem hiding this comment.
Can you add the output mir below? It should be in a file with a name like build/x86_64-unknown-linux-gnu/test/mir-opt/unusual-item-types/rustc/Test-X.mir_map.0.mir
There was a problem hiding this comment.
Also add the following to verify that we won't ICE with struct-like variants.
pub enum Test2 {
X { a: usize },
}
There was a problem hiding this comment.
👍 Added the tests
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
|
@bors r+ |
|
📌 Commit 3a83cb2 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 10, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 10, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 10, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 10, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 11, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Mar 11, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
pietroalbini
added a commit
to pietroalbini/rust
that referenced
this pull request
Mar 13, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Mar 15, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Mar 16, 2019
Fix ICE in MIR pretty printing
A `Def::Variant` should be considered as a function in mir pretty
printing. Each variant has a constructor that we must print.
Given the following enum definition:
```rust
pub enum TestMe {
X(usize),
}
```
We will need to generate a constructor for the variant `X` with a
signature that looks something like the following:
```
fn TestMe::X(_1: usize) -> TestMe;
```
Fixes: rust-lang#59021
bors
added a commit
that referenced
this pull request
Mar 16, 2019
Rollup of 37 pull requests Successful merges: - #58854 (appveyor: Use VS2017 for all our images) - #58855 (std: Spin for a global malloc lock on wasm32) - #58873 (Fix "Auto-hide item methods documentation" setting) - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS) - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std) - #58938 (core: ensure VaList passes improper_ctypes lint) - #58941 (MIPS: add r6 support) - #58949 (SGX target: Expose thread id function in os module) - #58959 (Add release notes for PR #56243) - #58976 (Default to integrated `rust-lld` linker for UEFI targets) - #59009 (Fix SGX implementations of read/write_vectored.) - #59025 (Fix generic argument lookup for Self) - #59036 (Fix ICE in MIR pretty printing) - #59037 (Avoid some common false positives in intra doc link checking) - #59072 (we can now skip should_panic tests with the libtest harness) - #59079 (add suggestions to invalid macro item error) - #59082 (A few improvements to comments in user-facing crates) - #59102 (Consistent naming for duration_float methods and additional f32 methods) - #59118 (rustc: fix ICE when trait alias has bare Self) - #59139 (Unregress using scalar unions in constants.) - #59146 (Suggest return lifetime when there's only one named lifetime) - #59147 (Make std time tests more robust for platform differences) - #59152 (Stabilize Range*::contains.) - #59156 ([wg-async-await] Add regression test for #55809.) - #59158 (Revert "Don't generate minification variable if minification disabled") - #59169 (Add `-Z allow_features=...` flag) - #59173 (bootstrap: Default to a sensible llvm-suffix.) - #59175 (Don't run test launching `echo` since that doesn't exist on Windows) - #59180 (Use try blocks in rustc_codegen_ssa) - #59185 (No old chestnuts in iter::repeat docs) - #59201 (Remove restriction on isize/usize in repr(simd)) - #59204 (Output diagnostic information for rustdoc) - #59206 (Improved test output) - #59208 (Reduce a Code Repetition Related to Bit Operation) - #59212 (Add x86_64 musl host to the manifest) - #59221 (Option and Result: Add references to documentation of as_ref and as_mut) - #59231 (Stabilize Option::copied)
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.
A
Def::Variantshould be considered as a function in mir prettyprinting. Each variant has a constructor that we must print.
Given the following enum definition:
We will need to generate a constructor for the variant
Xwith asignature that looks something like the following:
Fixes: #59021