Get rid of special const intrinsic query in favour of `const_eval` by oli-obk · Pull Request #61626 · rust-lang/rust

oli-obk · 2019-06-07T17:24:00Z

src/librustc_codegen_llvm/intrinsic.rs

eddyb

r=me with comment added (or moving more intrinsics)

bors · 2019-06-12T16:42:23Z

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

oli-obk · 2019-06-19T17:44:46Z

I ported the rest of the zero arg intrinsics and thus also deduplicated their implementation between const eval and codegen

eddyb

r=me

eddyb · 2019-06-20T10:53:48Z

src/librustc_mir/const_eval.rs

    })
 }

+fn eval_intrinsic<'tcx>(


Can you rename this to eval_nulary_intrinsic?

oli-obk · 2019-06-21T07:34:31Z

@bors r=eddyb

bors · 2019-06-21T07:34:32Z

📌 Commit f361410 has been approved by eddyb

bors · 2019-06-21T09:19:56Z

⌛ Testing commit f361410 with merge 43e46ab...

@eddyb

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

bors · 2019-06-21T10:16:09Z

💔 Test failed - checks-travis

rust-highfive · 2019-06-21T10:16:11Z

The job dist-i586-gnu-i586-i686-musl 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.

[00:53:20] 
[00:53:20] ---- [ui] ui/issues/issue-44415.rs stdout ----
[00:53:20] diff of stderr:
[00:53:20] 
[00:53:20] 10 LL |     bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }],
[00:53:20] 11    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[00:53:20] 12 note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
[00:53:20] -   --> $SRC_DIR/libcore/intrinsics.rs:LL:COL
[00:53:20] -    |
[00:53:20] - LL |     pub fn size_of<T>() -> usize;
[00:53:20] -    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[00:53:20] 17 note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
[00:53:20] -   --> $SRC_DIR/libcore/intrinsics.rs:LL:COL
[00:53:20] -    |
[00:53:20] - LL |     pub fn size_of<T>() -> usize;
[00:53:20] -    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[00:53:20] 22    = note: ...which requires computing layout of `Foo`...
[00:53:20] 23    = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`...
[00:53:20] 24 note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}#0`...
[00:53:20] 
[00:53:20] The actual stderr differed from the expected stderr.
[00:53:20] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-44415/issue-44415.stderr
[00:53:20] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-44415/issue-44415.stderr
[00:53:20] To update references, rerun the tests and pass the `--bless` flag
[00:53:20] To only update this specific test, also pass `--test-args issues/issue-44415.rs`
[00:53:20] error: 1 errors occurred comparing output.
[00:53:20] status: exit code: 1
[00:53:20] status: exit code: 1
[00:53:20] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-44415.rs" "-Zthreads=1" "--target=i586-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-44415" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/i586-unknown-linux-gnu/native/rust-test-helpers" "-Clinker=cc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-44415/auxiliary" "-A" "unused"
[00:53:20] ------------------------------------------
[00:53:20] 
[00:53:20] ------------------------------------------
[00:53:20] stderr:
[00:53:20] stderr:
[00:53:20] ------------------------------------------
[00:53:20] error[E0391]: cycle detected when const-evaluating + checking `Foo::bytes::{{constant}}#0`
[00:53:20]    |
[00:53:20]    |
[00:53:20] LL |     bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }],
[00:53:20]    |
[00:53:20]    |
[00:53:20] note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`...
[00:53:20]    |
[00:53:20]    |
[00:53:20] LL |     bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }],
[00:53:20]    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[00:53:20] note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
[00:53:20] note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
[00:53:20]    = note: ...which requires computing layout of `Foo`...
[00:53:20]    = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`...
[00:53:20] note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}#0`...
[00:53:20]    |
[00:53:20]    |
[00:53:20] LL |     bytes: [u8; unsafe { intrinsics::size_of::<Foo>() }],
[00:53:20]    |                 ^^^^^^
[00:53:20]    = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle
[00:53:20] note: cycle used when processing `Foo`
[00:53:20]    |
[00:53:20] LL | struct Foo {
[00:53:20]    | ^^^^^^^^^^
[00:53:20] 
---
[00:53:20] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:521:22
[00:53:20] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[00:53:20] 
[00:53:20] 
[00:53:20] 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/i586-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-i586-unknown-linux-gnu" "--mode" "ui" "--target" "i586-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "cc" "--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/i586-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "8.0.0-rust-1.37.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[00:53:20] 
[00:53:20] 
[00:53:20] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target i586-unknown-linux-gnu,i686-unknown-linux-musl
[00:53:20] Build completed unsuccessfully in 0:49:51
---
travis_time:end:03bb7ef0:start=1561112131572283512,finish=1561112131578122609,duration=5839097
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:18e70f51
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:28e5457c
travis_time:start:28e5457c
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0375be80
$ dmesg | grep -i kill

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)

oli-obk · 2019-06-21T11:07:50Z

Uh, even after a rebase I can't repro the failure locally even though it totally looks related. Not sure what is going on. Are there any flags (like debug or so) that can cause query backtraces to differ?

oli-obk · 2019-06-21T11:28:49Z

The CI failue is for i586-unknown-linux-gnu, maybe that's related? Though I don't see how

mati865 · 2019-06-21T12:33:07Z

Nevermind, builds other than dist-i586-gnu-i586-i686-musl are passing on Azure: https://dev.azure.com/rust-lang/rust/_build/results?buildId=1214

bors · 2019-07-04T03:12:06Z

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

src/librustc_mir/const_eval.rs

bors · 2019-07-23T23:42:45Z

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

src/librustc_mir/const_eval.rs

oli-obk · 2019-09-16T12:37:23Z

@bors r=eddyb

bors · 2019-09-16T12:37:24Z

📌 Commit 36e2da650b9667b5ac0def6a0d0e0e62265e5404 has been approved by eddyb

rust-highfive · 2019-09-16T13:58:32Z

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-09-16T12:35:42.5511275Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-16T12:35:42.5533530Z ##[command]git config gc.auto 0
2019-09-16T12:35:42.5536957Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-16T12:35:42.5539193Z ##[command]git config --get-all http.proxy
2019-09-16T12:35:42.5549014Z ##[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/61626/merge:refs/remotes/pull/61626/merge
---
2019-09-16T13:45:44.2762342Z .................................................................................................... 1500/9019
2019-09-16T13:45:51.1211036Z ....F............................................................................................... 1600/9019
2019-09-16T13:46:05.4425039Z .............................................................i...............i...................... 1700/9019
2019-09-16T13:46:13.6881162Z .................................................................................................... 1800/9019
2019-09-16T13:46:31.2913734Z ....................................................iiiii........................................... 1900/9019
2019-09-16T13:46:44.2886285Z .................................................................................................... 2100/9019
2019-09-16T13:46:47.2450116Z .................................................................................................... 2200/9019
2019-09-16T13:46:51.1871754Z .................................................................................................... 2300/9019
2019-09-16T13:47:00.4590634Z .................................................................................................... 2400/9019
---
2019-09-16T13:50:23.4387342Z .......................................i...............i............................................ 4700/9019
2019-09-16T13:50:36.1705579Z .................................................................................................... 4800/9019
2019-09-16T13:50:43.9403053Z .................................................................................................... 4900/9019
2019-09-16T13:50:55.3248130Z .................................................................................................... 5000/9019
2019-09-16T13:51:03.3737190Z .......................ii.ii........................................................................ 5100/9019
2019-09-16T13:51:15.2712632Z .................................................................................................... 5300/9019
2019-09-16T13:51:26.7808358Z .......................................................................................i............ 5400/9019
2019-09-16T13:51:36.0080255Z .................................................................................................... 5500/9019
2019-09-16T13:51:42.3011023Z .................................................................................................... 5600/9019
2019-09-16T13:51:42.3011023Z .................................................................................................... 5600/9019
2019-09-16T13:51:53.8531974Z ..................................................................................ii...i..ii........ 5700/9019
2019-09-16T13:52:22.9666938Z .................................................................................................... 5900/9019
2019-09-16T13:52:33.7715489Z .................................................................................................... 6000/9019
2019-09-16T13:52:33.7715489Z .................................................................................................... 6000/9019
2019-09-16T13:52:38.9767351Z ....................................................................................i..ii........... 6100/9019
2019-09-16T13:53:13.2222534Z .................................................................................................... 6300/9019
2019-09-16T13:53:16.1149168Z ...........................................i........................................................ 6400/9019
2019-09-16T13:53:18.6549575Z .................................................................................................... 6500/9019
2019-09-16T13:53:21.6008431Z ...............i.................................................................................... 6600/9019
---
2019-09-16T13:58:03.3767875Z ---- [ui] ui/consts/const-size_of-cycle.rs stdout ----
2019-09-16T13:58:03.3768500Z diff of stderr:
2019-09-16T13:58:03.3768641Z 
2019-09-16T13:58:03.3768784Z 19    |
2019-09-16T13:58:03.3769178Z 20 LL |     pub fn size_of<T>() -> usize;
2019-09-16T13:58:03.3769392Z 21    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-16T13:58:03.3769784Z - note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
2019-09-16T13:58:03.3770192Z -   --> $SRC_DIR/libcore/intrinsics.rs:LL:COL
2019-09-16T13:58:03.3770535Z -    |
2019-09-16T13:58:03.3771062Z - LL |     pub fn size_of<T>() -> usize;
2019-09-16T13:58:03.3771788Z -    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-16T13:58:03.3771985Z 27    = note: ...which requires computing layout of `Foo`...
2019-09-16T13:58:03.3772171Z 28    = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`...
2019-09-16T13:58:03.3772651Z 29    = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle
2019-09-16T13:58:03.3773206Z 
2019-09-16T13:58:03.3773377Z The actual stderr differed from the expected stderr.
2019-09-16T13:58:03.3773865Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-size_of-cycle/const-size_of-cycle.stderr
2019-09-16T13:58:03.3773865Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-size_of-cycle/const-size_of-cycle.stderr
2019-09-16T13:58:03.3774281Z To update references, rerun the tests and pass the `--bless` flag
2019-09-16T13:58:03.3774932Z To only update this specific test, also pass `--test-args consts/const-size_of-cycle.rs`
2019-09-16T13:58:03.3775414Z error: 1 errors occurred comparing output.
2019-09-16T13:58:03.3775747Z status: exit code: 1
2019-09-16T13:58:03.3775747Z status: exit code: 1
2019-09-16T13:58:03.3776840Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/const-size_of-cycle.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-size_of-cycle" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-size_of-cycle/auxiliary" "-A" "unused"
2019-09-16T13:58:03.3777605Z ------------------------------------------
2019-09-16T13:58:03.3777782Z 
2019-09-16T13:58:03.3778122Z ------------------------------------------
2019-09-16T13:58:03.3778295Z stderr:
2019-09-16T13:58:03.3778295Z stderr:
2019-09-16T13:58:03.3778960Z ------------------------------------------
2019-09-16T13:58:03.3779375Z error[E0391]: cycle detected when const-evaluating + checking `Foo::bytes::{{constant}}#0`
2019-09-16T13:58:03.3780184Z    |
2019-09-16T13:58:03.3780184Z    |
2019-09-16T13:58:03.3780331Z LL |     bytes: [u8; std::mem::size_of::<Foo>()]
2019-09-16T13:58:03.3780748Z    |
2019-09-16T13:58:03.3780748Z    |
2019-09-16T13:58:03.3781409Z note: ...which requires const-evaluating + checking `Foo::bytes::{{constant}}#0`...
2019-09-16T13:58:03.3782471Z    |
2019-09-16T13:58:03.3782471Z    |
2019-09-16T13:58:03.3782614Z LL |     bytes: [u8; std::mem::size_of::<Foo>()]
2019-09-16T13:58:03.3782906Z    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-16T13:58:03.3783341Z note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`...
2019-09-16T13:58:03.3783929Z    |
2019-09-16T13:58:03.3783929Z    |
2019-09-16T13:58:03.3784071Z LL |     intrinsics::size_of::<T>()
2019-09-16T13:58:03.3784215Z    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-16T13:58:03.3784616Z note: ...which requires const-evaluating + checking `std::intrinsics::size_of`...
2019-09-16T13:58:03.3785209Z    |
2019-09-16T13:58:03.3785209Z    |
2019-09-16T13:58:03.3786562Z LL |     pub fn size_of<T>() -> usize;
2019-09-16T13:58:03.3787559Z    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-16T13:58:03.3787651Z    = note: ...which requires computing layout of `Foo`...
2019-09-16T13:58:03.3787708Z    = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`...
2019-09-16T13:58:03.3788271Z    = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle
2019-09-16T13:58:03.3788354Z note: cycle used when processing `Foo`
2019-09-16T13:58:03.3788820Z    |
2019-09-16T13:58:03.3788883Z LL | struct Foo {
2019-09-16T13:58:03.3788927Z    | ^^^^^^^^^^
2019-09-16T13:58:03.3788958Z 
---
2019-09-16T13:58:03.3819874Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-09-16T13:58:03.3819953Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-16T13:58:03.3836214Z 
2019-09-16T13:58:03.3836282Z 
2019-09-16T13:58:03.3843903Z 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-09-16T13:58:03.3844359Z 
2019-09-16T13:58:03.3844414Z 
2019-09-16T13:58:03.3849086Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-16T13:58:03.3849163Z Build completed unsuccessfully in 1:14:35
2019-09-16T13:58:03.3849163Z Build completed unsuccessfully in 1:14:35
2019-09-16T13:58:03.3909889Z == clock drift check ==
2019-09-16T13:58:03.3932321Z   local time: Mon Sep 16 13:58:03 UTC 2019
2019-09-16T13:58:03.6908124Z   network time: Mon, 16 Sep 2019 13:58:03 GMT
2019-09-16T13:58:03.6909055Z == end clock drift check ==
2019-09-16T13:58:04.5444966Z ##[error]Bash exited with code '1'.
2019-09-16T13:58:04.5525519Z ##[section]Starting: Checkout
2019-09-16T13:58:04.5527822Z ==============================================================================
2019-09-16T13:58:04.5527875Z Task         : Get sources
2019-09-16T13:58:04.5527934Z 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)

Centril · 2019-09-16T15:10:13Z

PR builder failed, @bors r-

oli-obk · 2019-09-17T14:32:49Z

I forgot to rebase and ui tests changed on master.

@bors r=eddyb

bors · 2019-09-17T14:32:50Z

📌 Commit 0de9485 has been approved by eddyb

@eddyb

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

@eddyb

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

@eddyb

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

@ghost

Rollup of 10 pull requests Successful merges: - #61626 (Get rid of special const intrinsic query in favour of `const_eval`) - #64283 (Updated RELEASES.md for 1.38.0) - #64394 (Shrink `SubregionOrigin`.) - #64429 (Fix failure note `to_str` implementation) - #64436 (improve Vec example soundness in mem::transmute docs) - #64502 (avoid duplicate issues for Miri build failures) - #64505 (Fix inconsistent link formatting) - #64529 (Add an example to Pin::as_mut) - #64541 (document Miri error categories) - #64544 (build-manifest: re-add some comments) Failed merges: r? @ghost

bors · 2019-09-18T02:13:24Z

⌛ Testing commit 0de9485 with merge 5283791...

bjorn3 · 2019-09-18T06:52:28Z

Why did bors try to test this after the rollup has been successful?

RalfJung · 2019-09-18T07:36:09Z

That's a known bug in bors. Not sure if it is tracked anywhere though (you could ask in the infra channel on Discord).

bjorn3 · 2019-09-18T08:04:17Z

That's a known bug in bors.

:)

you could ask in the infra channel on Discord

Dont have a discord account

rust-highfive assigned eddyb Jun 7, 2019

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

eddyb reviewed Jun 10, 2019

View reviewed changes

src/librustc_codegen_llvm/intrinsic.rs Outdated Show resolved Hide resolved

eddyb approved these changes Jun 10, 2019

View reviewed changes

oli-obk force-pushed the const_eval_intrinsics branch from 34daa8f to 26c486f Compare June 19, 2019 17:43

oli-obk requested a review from eddyb June 19, 2019 17:52

eddyb approved these changes Jun 20, 2019

View reviewed changes

src/librustc_mir/const_eval.rs Outdated

})

}

fn eval_intrinsic<'tcx>(

Copy link

Member

eddyb Jun 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you rename this to eval_nulary_intrinsic?

mark-i-m mentioned this pull request Jun 21, 2019

Debugging support in rustc rust-lang/rustc-dev-guide#316

Merged

6 tasks

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 Jun 21, 2019

bors added a commit that referenced this pull request Jun 21, 2019

Auto merge of #61626 - oli-obk:const_eval_intrinsics, r=eddyb

43e46ab

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

bors mentioned this pull request Jun 21, 2019

More NodeId pruning #61984

Merged

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 21, 2019

oli-obk force-pushed the const_eval_intrinsics branch from f361410 to e214d29 Compare June 21, 2019 11:06

This comment has been minimized.

Sign in to view

RalfJung reviewed Jul 16, 2019

View reviewed changes

src/librustc_mir/const_eval.rs Outdated Show resolved Hide resolved

oli-obk force-pushed the const_eval_intrinsics branch from e214d29 to ffd0335 Compare July 18, 2019 14:19

oli-obk force-pushed the const_eval_intrinsics branch from ff654b8 to 039947d Compare September 13, 2019 14:25

bjorn3 requested changes Sep 16, 2019

View reviewed changes

src/librustc_mir/const_eval.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Sep 16, 2019

View reviewed changes

src/librustc_mir/const_eval.rs Outdated Show resolved Hide resolved

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 Sep 16, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 16, 2019

Get rid of special const intrinsic query in favour of const_eval

0de9485

oli-obk force-pushed the const_eval_intrinsics branch from 36e2da6 to 0de9485 Compare September 17, 2019 14:32

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 Sep 17, 2019

tmandry added a commit to tmandry/rust that referenced this pull request Sep 17, 2019

Rollup merge of rust-lang#61626 - oli-obk:const_eval_intrinsics, r=eddyb

b539c71

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

tmandry mentioned this pull request Sep 17, 2019

Rollup of 7 pull requests #64556

Closed

tmandry added a commit to tmandry/rust that referenced this pull request Sep 17, 2019

Rollup merge of rust-lang#61626 - oli-obk:const_eval_intrinsics, r=eddyb

dba5a1c

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

tmandry mentioned this pull request Sep 17, 2019

Rollup of 8 pull requests #64560

Closed

tmandry added a commit to tmandry/rust that referenced this pull request Sep 17, 2019

Rollup merge of rust-lang#61626 - oli-obk:const_eval_intrinsics, r=eddyb

6bbb935

Get rid of special const intrinsic query in favour of `const_eval` r? @eddyb

tmandry mentioned this pull request Sep 17, 2019

Rollup of 10 pull requests #64562

Merged

bors merged commit 0de9485 into rust-lang:master Sep 18, 2019

oli-obk deleted the const_eval_intrinsics branch March 16, 2021 12:13

Uh oh!

Conversation

oli-obk commented Jun 7, 2019

Uh oh!

Uh oh!

eddyb left a comment

Choose a reason for hiding this comment

Uh oh!

bors commented Jun 12, 2019

Uh oh!

oli-obk commented Jun 19, 2019

Uh oh!

eddyb left a comment

Choose a reason for hiding this comment

Uh oh!

eddyb Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

oli-obk commented Jun 21, 2019

Uh oh!

bors commented Jun 21, 2019

Uh oh!

bors commented Jun 21, 2019

Uh oh!

bors commented Jun 21, 2019

Uh oh!

rust-highfive commented Jun 21, 2019

Uh oh!

oli-obk commented Jun 21, 2019

Uh oh!

oli-obk commented Jun 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

mati865 commented Jun 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jul 4, 2019

Uh oh!

Uh oh!

bors commented Jul 23, 2019

Uh oh!

Uh oh!

Uh oh!

oli-obk commented Sep 16, 2019

Uh oh!

bors commented Sep 16, 2019

Uh oh!

rust-highfive commented Sep 16, 2019

Uh oh!

Centril commented Sep 16, 2019

Uh oh!

oli-obk commented Sep 17, 2019

Uh oh!

bors commented Sep 17, 2019

Uh oh!

bors commented Sep 18, 2019

Uh oh!

bjorn3 commented Sep 18, 2019

Uh oh!

RalfJung commented Sep 18, 2019

Uh oh!

bjorn3 commented Sep 18, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

oli-obk commented Jun 21, 2019 •

edited

Loading

mati865 commented Jun 21, 2019 •

edited

Loading