Fix ICE in MIR pretty printing #59036

dlrobertson · 2019-03-09T04:02:48Z

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;

Fixes: #59021

rust-highfive · 2019-03-09T04:02:51Z

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

estebank

Please tests

estebank · 2019-03-09T04:14:29Z

src/librustc_mir/util/pretty.rs

@@ -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,


Have you tested this with a strict style variant?

dlrobertson · 2019-03-09T04:50:06Z

Please tests

Are there MIR pretty-print tests?

Have you tested this with a strict style variant?

You mean one without a constructor? E.g. pub enum Test { X }

matthewjasper · 2019-03-09T07:29:45Z

Are there MIR pretty-print tests?

Yes, can you add this to src/test/mir-opt/unusual-item-types.rs?

petrochenkov · 2019-03-09T08:17:34Z

src/librustc_mir/util/pretty.rs

@@ -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,


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.

Ah, you're right. Good catch

@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.

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.

dlrobertson · 2019-03-09T21:51:12Z

Added a test and ensures it fails without the patch.

matthewjasper · 2019-03-09T21:54:27Z

src/test/mir-opt/unusual-item-types.rs

@@ -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


This shouldn't be needed

Apparently we don't automatically generate this MIR. Could you add let _ = Test::X as fn(usize) -> Test; to main instead?

👍 Thanks for the suggestion. This is much cleaner.

matthewjasper · 2019-03-09T22:01:25Z

src/test/mir-opt/unusual-item-types.rs

+// See #59021
+pub enum Test {
+    X(usize),
+}


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

Also add the following to verify that we won't ICE with struct-like variants.

pub enum Test2 { X { a: usize }, }

👍 Added the tests

rust-highfive · 2019-03-09T23:12:05Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:02feb64e:start=1552168304930864865,finish=1552168379302959201,duration=74372094336
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[01:18:51] ...................................F...
[01:18:51] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:496:22
[01:18:51] failures:
[01:18:51] 
[01:18:51] ---- [mir-opt] mir-opt/unusual-item-types.rs stdout ----
[01:18:51] thread '[mir-opt] mir-opt/unusual-item-types.rs' panicked at 'failed to exec `"/checkout/obj/build/x86_64-unknown-linux-gnu/test/mir-opt/unusual-item-types/a"`: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', src/libcore/result.rs:997:5
[01:18:51] 
[01:18:51] 
[01:18:51] failures:
[01:18:51]     [mir-opt] mir-opt/unusual-item-types.rs
[01:18:51]     [mir-opt] mir-opt/unusual-item-types.rs
[01:18:51] 
[01:18:51] test result: FAILED. 38 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:18:51] 
[01:18:51] 
[01:18:51] 
[01:18:51] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/mir-opt" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/mir-opt" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "mir-opt" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:18:51] 
[01:18:51] 
[01:18:51] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:18:51] Build completed unsuccessfully in 0:11:22
[01:18:51] Build completed unsuccessfully in 0:11:22
[01:18:51] make: *** [check] Error 1
[01:18:51] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:06526bfa
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Mar  9 23:12:00 UTC 2019

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 @TimNN. (Feature Requests)

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; ```

estebank · 2019-03-10T04:30:37Z

@bors r+

bors · 2019-03-10T04:30:38Z

📌 Commit 3a83cb2 has been approved by estebank

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

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)

rust-highfive assigned estebank Mar 9, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2019

estebank reviewed Mar 9, 2019

View reviewed changes

petrochenkov reviewed Mar 9, 2019

View reviewed changes

dlrobertson force-pushed the fix_59021 branch from ce25598 to 2d18cb9 Compare March 9, 2019 21:50

matthewjasper reviewed Mar 9, 2019

View reviewed changes

dlrobertson force-pushed the fix_59021 branch from 2d18cb9 to 55be811 Compare March 9, 2019 23:39

dlrobertson force-pushed the fix_59021 branch from 55be811 to 3a83cb2 Compare March 10, 2019 00:28

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 10, 2019

Centril mentioned this pull request Mar 10, 2019

Rollup of 16 pull requests #59066

Closed

Centril mentioned this pull request Mar 10, 2019

Rollup of 17 pull requests #59067

Closed

Centril mentioned this pull request Mar 10, 2019

Rollup of 16 pull requests #59069

Closed

Centril mentioned this pull request Mar 10, 2019

Rollup of 17 pull requests #59075

Closed

Centril mentioned this pull request Mar 11, 2019

Rollup of 15 pull requests #59081

Closed

kennytm mentioned this pull request Mar 11, 2019

Rollup of 23 pull requests #59108

Closed

dlrobertson mentioned this pull request Mar 12, 2019

Use a different DefId for the Def::Variant and Def::VariantCtor #59131

Closed

pietroalbini mentioned this pull request Mar 13, 2019

Rollup of 18 pull requests #59161

Closed

kennytm mentioned this pull request Mar 15, 2019

Rollup of 31 pull requests #59207

Closed

kennytm mentioned this pull request Mar 16, 2019

Rollup of 37 pull requests #59226

Merged

bors merged commit 3a83cb2 into rust-lang:master Mar 16, 2019

dlrobertson deleted the fix_59021 branch March 16, 2019 21:15

pnkfelix mentioned this pull request May 2, 2019

ICE when building with --emit=mir #60390

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ICE in MIR pretty printing #59036

Fix ICE in MIR pretty printing #59036

dlrobertson commented Mar 9, 2019 •

edited

Loading

rust-highfive commented Mar 9, 2019

estebank left a comment

estebank Mar 9, 2019

dlrobertson commented Mar 9, 2019

matthewjasper commented Mar 9, 2019

petrochenkov Mar 9, 2019

dlrobertson Mar 9, 2019

dlrobertson Mar 9, 2019

petrochenkov Mar 10, 2019 •

edited

Loading

dlrobertson commented Mar 9, 2019

matthewjasper Mar 9, 2019

matthewjasper Mar 9, 2019

dlrobertson Mar 10, 2019

matthewjasper Mar 9, 2019

estebank Mar 9, 2019

dlrobertson Mar 10, 2019

rust-highfive commented Mar 9, 2019

estebank commented Mar 10, 2019

bors commented Mar 10, 2019

Fix ICE in MIR pretty printing #59036

Fix ICE in MIR pretty printing #59036

Conversation

dlrobertson commented Mar 9, 2019 • edited Loading

rust-highfive commented Mar 9, 2019

estebank left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dlrobertson commented Mar 9, 2019

matthewjasper commented Mar 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

petrochenkov Mar 10, 2019 • edited Loading

Choose a reason for hiding this comment

dlrobertson commented Mar 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rust-highfive commented Mar 9, 2019

estebank commented Mar 10, 2019

bors commented Mar 10, 2019

dlrobertson commented Mar 9, 2019 •

edited

Loading

petrochenkov Mar 10, 2019 •

edited

Loading