Split ConstValue into two enums #66233

cjgillot · 2019-11-09T00:00:15Z

Hello,

Issue #59210 appeared abandoned, so I gave it a go.
Some further cleanup and refactoring may be mandated.

I did not test beyond x.py check, since my home computer dies compiling librustc.

rust-highfive · 2019-11-09T00:18:02Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-11-09T00:00:52.5942829Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-09T00:00:52.6124378Z ##[command]git config gc.auto 0
2019-11-09T00:00:52.6191707Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-09T00:00:52.6240894Z ##[command]git config --get-all http.proxy
2019-11-09T00:00:52.6393456Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66233/merge:refs/remotes/pull/66233/merge
---
2019-11-09T00:07:16.9798099Z    Compiling serde_json v1.0.40
2019-11-09T00:07:18.8232814Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-11-09T00:07:30.9403194Z     Finished release [optimized] target(s) in 1m 32s
2019-11-09T00:07:30.9492947Z tidy check
2019-11-09T00:07:31.6550920Z tidy error: /checkout/src/librustc_mir/hair/pattern/_match.rs:330: line longer than 100 chars
2019-11-09T00:07:31.6556545Z tidy error: /checkout/src/librustc_mir/hair/pattern/_match.rs:1206: line longer than 100 chars
2019-11-09T00:07:32.0469741Z tidy error: /checkout/src/librustc_codegen_ssa/mir/place.rs:483: line longer than 100 chars
2019-11-09T00:07:33.7804844Z Found 485 error codes
2019-11-09T00:07:33.7810019Z Found 0 error codes with no tests
2019-11-09T00:07:33.7810461Z Done!
2019-11-09T00:07:33.7810692Z some tidy checks failed
2019-11-09T00:07:33.7810692Z some tidy checks failed
2019-11-09T00:07:33.7810931Z 
2019-11-09T00:07:33.7811061Z 
2019-11-09T00:07:33.7812589Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-11-09T00:07:33.7812968Z 
2019-11-09T00:07:33.7813077Z 
2019-11-09T00:07:33.7818802Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-11-09T00:07:33.7818904Z Build completed unsuccessfully in 0:01:36
2019-11-09T00:07:33.7818904Z Build completed unsuccessfully in 0:01:36
2019-11-09T00:07:33.7867495Z == clock drift check ==
2019-11-09T00:07:33.7889838Z   local time: Sat Nov  9 00:07:33 UTC 2019
2019-11-09T00:07:33.8653857Z   network time: Sat, 09 Nov 2019 00:07:33 GMT
2019-11-09T00:07:33.8657082Z == end clock drift check ==
2019-11-09T00:07:35.1801898Z 
2019-11-09T00:07:35.1902060Z ##[error]Bash exited with code '1'.
2019-11-09T00:07:35.1938471Z ##[section]Starting: Checkout
2019-11-09T00:07:35.1940315Z ==============================================================================
2019-11-09T00:07:35.1940391Z Task         : Get sources
2019-11-09T00:07:35.1940441Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

src/librustc/ty/relate.rs

Centril · 2019-11-09T00:40:31Z

src/librustc/ty/sty.rs

 }

 #[cfg(target_arch = "x86_64")]
-static_assert_size!(Const<'_>, 40);
+static_assert_size!(Const<'_>, 48);


Centril · 2019-11-09T00:41:20Z

cc @oli-obk @varkor

bors · 2019-11-09T13:19:31Z

☔ The latest upstream changes (presumably #66242) made this pull request unmergeable. Please resolve the merge conflicts.

rust-highfive · 2019-11-09T19:58:36Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-11-09T18:45:10.2051880Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-09T18:45:10.2252713Z ##[command]git config gc.auto 0
2019-11-09T18:45:10.2333378Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-09T18:45:10.2393471Z ##[command]git config --get-all http.proxy
2019-11-09T18:45:10.2545426Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66233/merge:refs/remotes/pull/66233/merge
---
2019-11-09T19:46:33.2040748Z .................................................................................................... 1500/9220
2019-11-09T19:46:39.1237245Z .................................................................................................... 1600/9220
2019-11-09T19:46:48.6054252Z .................................................................................................i.. 1700/9220
2019-11-09T19:46:57.2683208Z .................................................................................................... 1800/9220
2019-11-09T19:47:04.4805825Z .................................................................................iiiii.............. 1900/9220
2019-11-09T19:47:26.9951948Z .................................................................................................... 2100/9220
2019-11-09T19:47:29.4075469Z .................................................................................................... 2200/9220
2019-11-09T19:47:32.0077793Z .................................................................................................... 2300/9220
2019-11-09T19:47:46.0056637Z .................................................................................................... 2400/9220
---
2019-11-09T19:50:39.0744085Z ...........................................................................i...............i........ 4700/9220
2019-11-09T19:50:46.7340455Z .................................................................................................... 4800/9220
2019-11-09T19:50:55.7398480Z .................................................................................................... 4900/9220
2019-11-09T19:51:01.0406577Z .................................................................................................... 5000/9220
2019-11-09T19:51:12.6261095Z .............................................................................ii.ii...........i...... 5100/9220
2019-11-09T19:51:21.4027459Z ............i....................................................................................... 5300/9220
2019-11-09T19:51:32.0859416Z .................................................................................................... 5400/9220
2019-11-09T19:51:38.7349424Z ...........................................................i........................................ 5500/9220
2019-11-09T19:51:46.0023225Z .................................................................................................... 5600/9220
2019-11-09T19:51:46.0023225Z .................................................................................................... 5600/9220
2019-11-09T19:51:55.9784266Z .................................................................................................... 5700/9220
2019-11-09T19:52:03.4174823Z ............................................ii...i..ii...........i.................................. 5800/9220
2019-11-09T19:52:26.6992621Z .................................................................................................... 6000/9220
2019-11-09T19:52:33.6239969Z .................................................................................................... 6100/9220
2019-11-09T19:52:33.6239969Z .................................................................................................... 6100/9220
2019-11-09T19:52:39.5157043Z ...............................................................i..ii................................ 6200/9220
2019-11-09T19:53:08.7328113Z .................................................................................................... 6400/9220
2019-11-09T19:53:11.6985335Z ...............................i.................................................................... 6500/9220
2019-11-09T19:53:13.0731180Z .................................................................................................... 6600/9220
2019-11-09T19:53:15.5324621Z ...............i.................................................................................... 6700/9220
---
2019-11-09T19:58:11.3176981Z 
2019-11-09T19:58:11.3177124Z 46 LL |         #[rustc_def_path]
2019-11-09T19:58:11.3177294Z 47    |         ^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3177430Z 48 
2019-11-09T19:58:11.3178056Z - error: symbol-name(_ZN209_$LT$$u5b$$RF$dyn$u20$impl1..Foo$u2b$Assoc$u20$$u3d$$u20$extern$u20$$u22$C$u22$$u20$fn$LP$$RF$u8$C$$u20$...$RP$$u2b$impl1..AutoTrait$u3b$$u20$_$u5d$$u20$as$u20$impl1..main..$u7b$$u7b$closure$u7d$$u7d$..Bar$GT$6method17h61b0fcb05ebeeb79E)
2019-11-09T19:58:11.3179032Z + error: symbol-name(_ZN209_$LT$$u5b$$RF$dyn$u20$impl1..Foo$u2b$Assoc$u20$$u3d$$u20$extern$u20$$u22$C$u22$$u20$fn$LP$$RF$u8$C$$u20$...$RP$$u2b$impl1..AutoTrait$u3b$$u20$_$u5d$$u20$as$u20$impl1..main..$u7b$$u7b$closure$u7d$$u7d$..Bar$GT$6method17h92c563325b7ff21aE)
2019-11-09T19:58:11.3179631Z 51    |
2019-11-09T19:58:11.3179784Z 52 LL |             #[rustc_symbol_name]
2019-11-09T19:58:11.3179925Z 
2019-11-09T19:58:11.3180064Z 53    |             ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3180064Z 53    |             ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3180198Z 54 
2019-11-09T19:58:11.3180687Z - error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; _] as impl1::main::{{closure}}::Bar>::method::h61b0fcb05ebeeb79)
2019-11-09T19:58:11.3180887Z + error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; _] as impl1::main::{{closure}}::Bar>::method::h92c563325b7ff21a)
2019-11-09T19:58:11.3181452Z 57    |
2019-11-09T19:58:11.3181592Z 58 LL |             #[rustc_symbol_name]
2019-11-09T19:58:11.3181713Z 
2019-11-09T19:58:11.3181848Z 
2019-11-09T19:58:11.3181848Z 
2019-11-09T19:58:11.3181985Z The actual stderr differed from the expected stderr.
2019-11-09T19:58:11.3182419Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/symbol-names/impl1.legacy/impl1.legacy.stderr
2019-11-09T19:58:11.3182849Z To update references, rerun the tests and pass the `--bless` flag
2019-11-09T19:58:11.3183261Z To only update this specific test, also pass `--test-args symbol-names/impl1.rs`
2019-11-09T19:58:11.3183417Z 
2019-11-09T19:58:11.3183583Z error in revision `legacy`: 1 errors occurred comparing output.
2019-11-09T19:58:11.3183721Z status: exit code: 1
2019-11-09T19:58:11.3184788Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/symbol-names/impl1.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "legacy" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/symbol-names/impl1.legacy" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Z" "symbol-mangling-version=legacy" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/symbol-names/impl1.legacy/auxiliary" "-A" "unused"
2019-11-09T19:58:11.3185607Z ------------------------------------------
2019-11-09T19:58:11.3185766Z 
2019-11-09T19:58:11.3186112Z ------------------------------------------
2019-11-09T19:58:11.3186301Z stderr:
2019-11-09T19:58:11.3186301Z stderr:
2019-11-09T19:58:11.3186638Z ------------------------------------------
2019-11-09T19:58:11.3187035Z error: symbol-name(_ZN5impl13foo3Foo3bar17h92cf46db76791039E)
2019-11-09T19:58:11.3187626Z    |
2019-11-09T19:58:11.3187780Z LL |         #[rustc_symbol_name]
2019-11-09T19:58:11.3187933Z    |         ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3188049Z 
2019-11-09T19:58:11.3188049Z 
2019-11-09T19:58:11.3188186Z error: demangling(impl1::foo::Foo::bar::h92cf46db76791039)
2019-11-09T19:58:11.3188737Z    |
2019-11-09T19:58:11.3188892Z LL |         #[rustc_symbol_name]
2019-11-09T19:58:11.3189029Z    |         ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3189146Z 
2019-11-09T19:58:11.3189146Z 
2019-11-09T19:58:11.3189495Z error: demangling-alt(impl1::foo::Foo::bar)
2019-11-09T19:58:11.3190073Z    |
2019-11-09T19:58:11.3190227Z LL |         #[rustc_symbol_name]
2019-11-09T19:58:11.3190366Z    |         ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3190481Z 
2019-11-09T19:58:11.3190481Z 
2019-11-09T19:58:11.3190807Z error: def-path(foo::Foo::bar)
2019-11-09T19:58:11.3192186Z    |
2019-11-09T19:58:11.3192256Z LL |         #[rustc_def_path]
2019-11-09T19:58:11.3192425Z    |         ^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3192454Z 
2019-11-09T19:58:11.3192454Z 
2019-11-09T19:58:11.3192831Z error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h90c4a800b1aa0df0E)
2019-11-09T19:58:11.3193146Z    |
2019-11-09T19:58:11.3193189Z LL |         #[rustc_symbol_name]
2019-11-09T19:58:11.3193261Z    |         ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3193291Z 
2019-11-09T19:58:11.3193291Z 
2019-11-09T19:58:11.3193339Z error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::h90c4a800b1aa0df0)
2019-11-09T19:58:11.3193645Z    |
2019-11-09T19:58:11.3193687Z LL |         #[rustc_symbol_name]
2019-11-09T19:58:11.3193731Z    |         ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3193776Z 
2019-11-09T19:58:11.3193776Z 
2019-11-09T19:58:11.3194012Z error: demangling-alt(impl1::bar::<impl impl1::foo::Foo>::baz)
2019-11-09T19:58:11.3194314Z    |
2019-11-09T19:58:11.3194357Z LL |         #[rustc_symbol_name]
2019-11-09T19:58:11.3194401Z    |         ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3194429Z 
2019-11-09T19:58:11.3194429Z 
2019-11-09T19:58:11.3194661Z error: def-path(bar::<impl foo::Foo>::baz)
2019-11-09T19:58:11.3194937Z    |
2019-11-09T19:58:11.3195003Z LL |         #[rustc_def_path]
2019-11-09T19:58:11.3195151Z    |         ^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3195193Z 
2019-11-09T19:58:11.3195193Z 
2019-11-09T19:58:11.3195672Z error: symbol-name(_ZN209_$LT$$u5b$$RF$dyn$u20$impl1..Foo$u2b$Assoc$u20$$u3d$$u20$extern$u20$$u22$C$u22$$u20$fn$LP$$RF$u8$C$$u20$...$RP$$u2b$impl1..AutoTrait$u3b$$u20$_$u5d$$u20$as$u20$impl1..main..$u7b$$u7b$closure$u7d$$u7d$..Bar$GT$6method17h92c563325b7ff21aE)
2019-11-09T19:58:11.3195994Z    |
2019-11-09T19:58:11.3196038Z LL |             #[rustc_symbol_name]
2019-11-09T19:58:11.3196110Z    |             ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3196139Z 
2019-11-09T19:58:11.3196139Z 
2019-11-09T19:58:11.3196200Z error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; _] as impl1::main::{{closure}}::Bar>::method::h92c563325b7ff21a)
2019-11-09T19:58:11.3196512Z    |
2019-11-09T19:58:11.3196641Z LL |             #[rustc_symbol_name]
2019-11-09T19:58:11.3196711Z    |             ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3196741Z 
2019-11-09T19:58:11.3196741Z 
2019-11-09T19:58:11.3197079Z error: demangling-alt(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; _] as impl1::main::{{closure}}::Bar>::method)
2019-11-09T19:58:11.3197382Z    |
2019-11-09T19:58:11.3197424Z LL |             #[rustc_symbol_name]
2019-11-09T19:58:11.3197468Z    |             ^^^^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3197512Z 
2019-11-09T19:58:11.3197512Z 
2019-11-09T19:58:11.3197822Z error: def-path(<[&dyn Foo<Assoc = for<'r> extern "C" fn(&'r u8, ...)> + AutoTrait; _] as main::{{closure}}#1::Bar>::method)
2019-11-09T19:58:11.3198126Z    |
2019-11-09T19:58:11.3198171Z LL |             #[rustc_def_path]
2019-11-09T19:58:11.3198217Z    |             ^^^^^^^^^^^^^^^^^
2019-11-09T19:58:11.3198246Z 
---
2019-11-09T19:58:11.3206085Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-11-09T19:58:11.3206355Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-11-09T19:58:11.3223996Z 
2019-11-09T19:58:11.3224072Z 
2019-11-09T19:58:11.3226114Z 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/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--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 -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -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"
2019-11-09T19:58:11.3226369Z 
2019-11-09T19:58:11.3226399Z 
2019-11-09T19:58:11.3232126Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-11-09T19:58:11.3232201Z Build completed unsuccessfully in 1:05:22
2019-11-09T19:58:11.3232201Z Build completed unsuccessfully in 1:05:22
2019-11-09T19:58:11.3285619Z == clock drift check ==
2019-11-09T19:58:11.3298652Z   local time: Sat Nov  9 19:58:11 UTC 2019
2019-11-09T19:58:11.6090993Z   network time: Sat, 09 Nov 2019 19:58:11 GMT
2019-11-09T19:58:11.6091152Z == end clock drift check ==
2019-11-09T19:58:12.3554373Z 
2019-11-09T19:58:12.3696910Z ##[error]Bash exited with code '1'.
2019-11-09T19:58:12.3739778Z ##[section]Starting: Checkout
2019-11-09T19:58:12.3741666Z ==============================================================================
2019-11-09T19:58:12.3741721Z Task         : Get sources
2019-11-09T19:58:12.3741772Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

cjgillot · 2019-11-10T17:21:59Z

I have absolutely no idea how to fix those tests.

oli-obk · 2019-11-11T11:29:59Z

You can run the tests with --bless to update the ui output to your changes. It's just some hashes changing, which is totally expected in some cases

rust-highfive · 2019-11-11T13:47:09Z

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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.

2019-11-11T12:33:49.9338795Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-11T12:33:49.9539611Z ##[command]git config gc.auto 0
2019-11-11T12:33:49.9604401Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-11T12:33:49.9653745Z ##[command]git config --get-all http.proxy
2019-11-11T12:33:49.9793835Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66233/merge:refs/remotes/pull/66233/merge
---
2019-11-11T13:34:54.0515140Z .................................................................................................... 1500/9228
2019-11-11T13:35:00.2207879Z .................................................................................................... 1600/9228
2019-11-11T13:35:09.5350342Z .................................................................................................... 1700/9228
2019-11-11T13:35:18.2757752Z ...i................................................................................................ 1800/9228
2019-11-11T13:35:25.2128217Z ......................................................................................iiiii......... 1900/9228
2019-11-11T13:35:47.1051380Z .................................................................................................... 2100/9228
2019-11-11T13:35:49.5468282Z .................................................................................................... 2200/9228
2019-11-11T13:35:52.1089560Z .................................................................................................... 2300/9228
2019-11-11T13:36:01.8662788Z .................................................................................................... 2400/9228
---
2019-11-11T13:38:59.6452501Z ..................................................................................i...............i. 4700/9228
2019-11-11T13:39:07.3878332Z .................................................................................................... 4800/9228
2019-11-11T13:39:17.0452943Z .................................................................................................... 4900/9228
2019-11-11T13:39:22.5256152Z .................................................................................................... 5000/9228
2019-11-11T13:39:34.2692293Z .....................................................................................ii.ii.......... 5100/9228
2019-11-11T13:39:38.1652827Z .i.................................................................................................. 5200/9228
2019-11-11T13:39:53.1537183Z .................................................................................................... 5400/9228
2019-11-11T13:40:00.2364534Z ...................................................................i................................ 5500/9228
2019-11-11T13:40:08.3560946Z .................................................................................................... 5600/9228
2019-11-11T13:40:15.9162703Z .................................................................................................... 5700/9228
2019-11-11T13:40:15.9162703Z .................................................................................................... 5700/9228
2019-11-11T13:40:25.1730471Z ....................................................ii...i..ii...........i.......................... 5800/9228
2019-11-11T13:40:48.3290472Z .................................................................................................... 6000/9228
2019-11-11T13:40:56.8856881Z .................................................................................................... 6100/9228
2019-11-11T13:40:56.8856881Z .................................................................................................... 6100/9228
2019-11-11T13:41:02.3074897Z .......................................................................i..ii........................ 6200/9228
2019-11-11T13:41:32.4169684Z .................................................................................................... 6400/9228
2019-11-11T13:41:34.6035521Z .......................................i............................................................ 6500/9228
2019-11-11T13:41:36.8592936Z .................................................................................................... 6600/9228
2019-11-11T13:41:39.2305224Z .......................i............................................................................ 6700/9228
---
2019-11-11T13:46:54.6337776Z running 64 tests
2019-11-11T13:47:00.2725441Z .........F......................................................
2019-11-11T13:47:00.2726079Z failures:
2019-11-11T13:47:00.2727211Z 
2019-11-11T13:47:00.2728371Z ---- [mir-opt] mir-opt/const_prop/const_prop_fails_gracefully.rs stdout ----
2019-11-11T13:47:00.2730797Z [ERROR compiletest::runtest] None
2019-11-11T13:47:00.2731743Z thread '[mir-opt] mir-opt/const_prop/const_prop_fails_gracefully.rs' panicked at 'Did not find expected line, error: Mismatch in lines
2019-11-11T13:47:00.2732146Z Current block: None
2019-11-11T13:47:00.2732317Z Actual Line: "        _2 = const Value(Scalar(AllocId(1).0x0)) : *const i32;"
2019-11-11T13:47:00.2732498Z Expected Line: "     _2 = const Scalar(AllocId(1).0x0) : *const i32;"
2019-11-11T13:47:00.2732630Z Test Name: rustc.main.ConstProp.after.mir
2019-11-11T13:47:00.2732912Z ... (elided)
2019-11-11T13:47:00.2733031Z  bb0: {
2019-11-11T13:47:00.2733170Z ... (elided)
2019-11-11T13:47:00.2733170Z ... (elided)
2019-11-11T13:47:00.2733314Z      _4 = const Scalar(AllocId(1).0x0) : &i32;
2019-11-11T13:47:00.2733441Z      _3 = const Scalar(AllocId(1).0x0) : &i32;
2019-11-11T13:47:00.2733584Z      _2 = const Scalar(AllocId(1).0x0) : *const i32;
2019-11-11T13:47:00.2733707Z ... (elided)
2019-11-11T13:47:00.2733828Z      _1 = move _2 as usize (Misc);
2019-11-11T13:47:00.2733973Z ... (elided)
2019-11-11T13:47:00.2734095Z      _6 = _1;
2019-11-11T13:47:00.2734501Z      _5 = const read(move _6) -> bb1;
2019-11-11T13:47:00.2734810Z Actual:
2019-11-11T13:47:00.2735354Z fn  main() -> () {
2019-11-11T13:47:00.2735566Z     let mut _0: ();
2019-11-11T13:47:00.2735706Z     let _1: usize;
2019-11-11T13:47:00.2735706Z     let _1: usize;
2019-11-11T13:47:00.2735832Z     let mut _2: *const i32;
2019-11-11T13:47:00.2735972Z     let mut _3: &i32;
2019-11-11T13:47:00.2736095Z     let mut _4: &i32;
2019-11-11T13:47:00.2736452Z     let _5: ();
2019-11-11T13:47:00.2736613Z     let mut _6: usize;
2019-11-11T13:47:00.2736736Z     scope 1 {
2019-11-11T13:47:00.2736995Z     bb0: {
2019-11-11T13:47:00.2737116Z         StorageLive(_1);
2019-11-11T13:47:00.2737238Z         StorageLive(_2);
2019-11-11T13:47:00.2737380Z         StorageLive(_3);
2019-11-11T13:47:00.2737380Z         StorageLive(_3);
2019-11-11T13:47:00.2737501Z         StorageLive(_4);
2019-11-11T13:47:00.2737626Z         _4 = const Scalar(AllocId(1).0x0) : &i32;
2019-11-11T13:47:00.2737775Z         _3 = const Scalar(AllocId(1).0x0) : &i32;
2019-11-11T13:47:00.2737903Z         _2 = const Value(Scalar(AllocId(1).0x0)) : *const i32;
2019-11-11T13:47:00.2738466Z         StorageDead(_3);
2019-11-11T13:47:00.2738628Z         _1 = move _2 as usize (Misc);
2019-11-11T13:47:00.2738754Z         StorageDead(_2);
2019-11-11T13:47:00.2739021Z         StorageDead(_4);
2019-11-11T13:47:00.2739197Z         StorageLive(_5);
2019-11-11T13:47:00.2740394Z         StorageLive(_6);
2019-11-11T13:47:00.2740638Z         _6 = _1;
2019-11-11T13:47:00.2741241Z         _5 = const read(move _6) -> bb1;
2019-11-11T13:47:00.2741824Z     bb1: {
2019-11-11T13:47:00.2741945Z         StorageDead(_6);
2019-11-11T13:47:00.2742061Z         StorageDead(_5);
2019-11-11T13:47:00.2742194Z         _0 = ();
2019-11-11T13:47:00.2742194Z         _0 = ();
2019-11-11T13:47:00.2742312Z         StorageDead(_1);
2019-11-11T13:47:00.2742425Z         return;
2019-11-11T13:47:00.2742559Z     }
2019-11-11T13:47:00.2742678Z     bb2 (cleanup): {
2019-11-11T13:47:00.2742794Z         resume;
2019-11-11T13:47:00.2743295Z }', src/tools/compiletest/src/runtest.rs:3299:13
2019-11-11T13:47:00.2743639Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-11-11T13:47:00.2743773Z 
2019-11-11T13:47:00.2743878Z 
---
2019-11-11T13:47:00.2745217Z 
2019-11-11T13:47:00.2745629Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-11-11T13:47:00.2745769Z 
2019-11-11T13:47:00.2745873Z 
2019-11-11T13:47:00.2747661Z 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 -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -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"
2019-11-11T13:47:00.2749090Z 
2019-11-11T13:47:00.2749351Z 
2019-11-11T13:47:00.2749566Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-11-11T13:47:00.2749975Z Build completed unsuccessfully in 1:06:18
2019-11-11T13:47:00.2749975Z Build completed unsuccessfully in 1:06:18
2019-11-11T13:47:00.2794196Z == clock drift check ==
2019-11-11T13:47:00.2809766Z   local time: Mon Nov 11 13:47:00 UTC 2019
2019-11-11T13:47:00.5594080Z   network time: Mon, 11 Nov 2019 13:47:00 GMT
2019-11-11T13:47:00.5596550Z == end clock drift check ==
2019-11-11T13:47:04.3892042Z 
2019-11-11T13:47:04.4033754Z ##[error]Bash exited with code '1'.
2019-11-11T13:47:04.4096359Z ##[section]Starting: Checkout
2019-11-11T13:47:04.4098534Z ==============================================================================
2019-11-11T13:47:04.4098615Z Task         : Get sources
2019-11-11T13:47:04.4098664Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

bors · 2019-11-12T08:26:09Z

☔ The latest upstream changes (presumably #66129) made this pull request unmergeable. Please resolve the merge conflicts.

cjgillot · 2019-11-12T23:07:46Z

Blessed the hashes and the mir dump.

oli-obk · 2019-11-13T00:12:48Z

@bors r+

bors · 2019-11-13T00:12:49Z

📌 Commit 552fa64 has been approved by oli-obk

bors · 2019-11-14T04:54:57Z

⌛ Testing commit 552fa64 with merge 5e380b7...

Split ConstValue into two enums Hello, Issue #59210 appeared abandoned, so I gave it a go. Some further cleanup and refactoring may be mandated. I did not test beyond `x.py check`, since my home computer dies compiling librustc. Fixes #59210

bors · 2019-11-14T08:02:55Z

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 5e380b7 to master...

rust-highfive · 2019-11-14T08:04:12Z

📣 Toolstate changed by #66233!

Tested on commit 5e380b7.
Direct link to PR: #66233

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

@mcarton

Tested on commit rust-lang/rust@5e380b7. Direct link to PR: <rust-lang/rust#66233> 💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

Rustup rust-lang/rust#66233 changelog: none

rust-highfive assigned eddyb Nov 9, 2019

Centril reviewed Nov 9, 2019

View reviewed changes

src/librustc/ty/relate.rs Outdated Show resolved Hide resolved

Centril reviewed Nov 9, 2019

View reviewed changes

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 9, 2019

cjgillot force-pushed the constkind branch from 667b87b to f7db55c Compare November 9, 2019 18:44

cjgillot added 14 commits November 12, 2019 20:14

Create intermediate enum ty::ConstKind.

e5fb784

Refactor pretty_print_const.

ee33e02

Rename in librustc_traits.

ff6b7cd

Rename in librustc_typecheck.

028c83c

Rename in librustc_mir.

7378c25

Rename in librustc_codegen_utils.

c671252

Rename in librustc_codegen_ssa.

25fab7e

Rename in librustc_codegen_llvm.

1f2c18c

Rename in librustdoc.

3ebfa18

Remove cruft.

f9ff78b

Fix tidy.

6b56dce

Centril review.

4caa66f

Bless symbol-names.

a1af690

Bless mir-dump test.

552fa64

cjgillot force-pushed the constkind branch from b90e74c to 552fa64 Compare November 12, 2019 21:09

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 13, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2019

bors merged commit 552fa64 into rust-lang:master Nov 14, 2019

rust-highfive mentioned this pull request Nov 14, 2019

clippy-driver no longer builds after rust-lang/rust#66233 #66409

Closed

This was referenced Nov 14, 2019

Better pretty printing for const raw pointers #65859

Closed

Show the actual value of constant values in the documentation #66221

Merged

Async fn resume after completion #66321

Merged

Make dataflow-based const qualification the canonical one #66385

Merged

JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Nov 14, 2019

Rustup rust-lang/rust#66233

0736dd9

bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 14, 2019

Auto merge of #4815 - JohnTitor:rustup, r=matthiaskrgr

b4f1769

Rustup rust-lang/rust#66233 changelog: none

cjgillot deleted the constkind branch November 18, 2019 08:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split ConstValue into two enums #66233

Split ConstValue into two enums #66233

cjgillot commented Nov 9, 2019

rust-highfive commented Nov 9, 2019

Centril Nov 9, 2019

Centril commented Nov 9, 2019

bors commented Nov 9, 2019

rust-highfive commented Nov 9, 2019

cjgillot commented Nov 10, 2019

oli-obk commented Nov 11, 2019

rust-highfive commented Nov 11, 2019

bors commented Nov 12, 2019

cjgillot commented Nov 12, 2019

oli-obk commented Nov 13, 2019

bors commented Nov 13, 2019

bors commented Nov 14, 2019

bors commented Nov 14, 2019

rust-highfive commented Nov 14, 2019

Split ConstValue into two enums #66233

Split ConstValue into two enums #66233

Conversation

cjgillot commented Nov 9, 2019

rust-highfive commented Nov 9, 2019

Centril Nov 9, 2019

Choose a reason for hiding this comment

Centril commented Nov 9, 2019

bors commented Nov 9, 2019

rust-highfive commented Nov 9, 2019

cjgillot commented Nov 10, 2019

oli-obk commented Nov 11, 2019

rust-highfive commented Nov 11, 2019

bors commented Nov 12, 2019

cjgillot commented Nov 12, 2019

oli-obk commented Nov 13, 2019

bors commented Nov 13, 2019

bors commented Nov 14, 2019

bors commented Nov 14, 2019

rust-highfive commented Nov 14, 2019