Split up `const_eval.rs` #67327

oli-obk · 2019-12-15T16:42:42Z

src/librustc_mir/const_eval/machine.rs

Centril · 2019-12-16T04:50:04Z

Btw... perhaps its time to consider moving const eval & interpretation out of librustc_mir into its own crate. (Not in this PR though, which is already doing god's work.)

RalfJung · 2019-12-22T15:12:15Z

I don't entirely understand the separation between const_eval.rs and query.rs. Both of these cyclically depend on each other, so we haven't really achieved any layering here, have we?

oli-obk · 2019-12-22T20:06:10Z

so we haven't really achieved any layering here, have we?

No, but I didn't feel like creating a deeper module structure right now, so I just split things by what they do, not necessarily increasing the modularity.

RalfJung · 2019-12-22T20:08:10Z

so I just split things by what they do, not necessarily increasing the modularity.

I don't understand what the criterion is that puts stuff into const_eval.rs vs query.rs. To me it looks like a random subset of queries has their main method but not their helper methods in query.rs, or so.

Could you elaborate?

oli-obk · 2019-12-22T20:15:31Z

query.rs contains the two query providers and all functions that are only used by these (except for that one function which is a glorified constant of an error message).

const_eval.rs contains everything that I couldn't figure out a good module for. While the leftover query there could be moved, it don't make sense in a match_helpers module, because it is used not as a query by match checking and as a query by codegen. This was so entangled I just gave up on modularizing it.

RalfJung · 2019-12-22T20:17:32Z

There are other queries though, right? The field projection and downcast stuff?

To my untrained eye, the separation between the two files looks pretty arbitrary, and I am not sure if it helps. It's useful to separate things that can be neatly separated as it makes files shorter and thus stuff easier to find, but it is IMO bad to separate things that are hard to tell apart as it'll just mean I will have to check both of these files every single time as I cannot predict which one a given function fits into.

src/librustc_mir/const_eval/query.rs

RalfJung · 2019-12-22T20:20:48Z

As an alternative split, what about putting everything needed by the two "main" queries into query.rs (in particular, op_to_const and mk_eval_cx), and then leaving only the "misc other stuff" in const_eval.rs?

oli-obk · 2019-12-22T20:38:53Z

As an alternative split, what about putting everything needed by the two "main" queries into query.rs (in particular, op_to_const and mk_eval_cx), and then leaving only the "misc other stuff" in const_eval.rs?

That seems reasonable

RalfJung · 2019-12-22T20:46:08Z

Not sure if query.rs is a good filename though; i was initially quite confused because I knew enough to know that the field projection thing is also a query but is not in query.rs.

oli-obk · 2019-12-22T20:55:32Z

The other functions left in const_eval.rs are actually the ones that make no sense in the const_eval module. They aren't about const eval really. They are about projecting constants for match checking or for simd_shuffle being implemented before const generics were a thing

bors · 2019-12-22T22:40:53Z

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

src/bootstrap/compile.rs

RalfJung · 2019-12-23T09:02:18Z

👍 for the split. Any proposals for the query.rs filename?

oli-obk · 2019-12-23T10:26:25Z

ctfe_entrypoints
eval_queries

RalfJung · 2019-12-23T11:46:52Z

Hm, const_eval/eval_queries.rs is kind of odd but I still dislike that the least, I think.^^

rust-highfive · 2019-12-23T14:33:11Z

The job x86_64-gnu-llvm-7 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-12-23T14:14:12.5158371Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-23T14:14:13.0470258Z ##[command]git config gc.auto 0
2019-12-23T14:14:13.0472662Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-23T14:14:13.0479642Z ##[command]git config --get-all http.proxy
2019-12-23T14:14:13.0484030Z ##[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/67327/merge:refs/remotes/pull/67327/merge
---
2019-12-23T14:20:24.5092155Z    Compiling serde_json v1.0.40
2019-12-23T14:20:26.2404123Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-12-23T14:20:37.4323510Z     Finished release [optimized] target(s) in 1m 29s
2019-12-23T14:20:37.4435677Z tidy check
2019-12-23T14:20:38.4260296Z tidy error: /checkout/src/librustc_mir/const_eval/eval_queries.rs:304: line longer than 100 chars
2019-12-23T14:20:38.4261200Z tidy error: /checkout/src/librustc_mir/const_eval/eval_queries.rs:307: line longer than 100 chars
2019-12-23T14:20:38.4261552Z tidy error: /checkout/src/librustc_mir/const_eval/eval_queries.rs:318: line longer than 100 chars
2019-12-23T14:20:38.4261842Z tidy error: /checkout/src/librustc_mir/const_eval/eval_queries.rs:319: line longer than 100 chars
2019-12-23T14:20:38.4262109Z tidy error: /checkout/src/librustc_mir/const_eval/eval_queries.rs:336: line longer than 100 chars
2019-12-23T14:20:40.2660636Z some tidy checks failed
2019-12-23T14:20:40.2661529Z Found 485 error codes
2019-12-23T14:20:40.2662055Z Found 0 error codes with no tests
2019-12-23T14:20:40.2662297Z Done!
2019-12-23T14:20:40.2662297Z Done!
2019-12-23T14:20:40.2662498Z 
2019-12-23T14:20:40.2662697Z 
2019-12-23T14:20:40.2664063Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/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-12-23T14:20:40.2664654Z 
2019-12-23T14:20:40.2664851Z 
2019-12-23T14:20:40.2670218Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-12-23T14:20:40.2670589Z Build completed unsuccessfully in 0:01:40
2019-12-23T14:20:40.2670589Z Build completed unsuccessfully in 0:01:40
2019-12-23T14:20:40.2727693Z == clock drift check ==
2019-12-23T14:20:40.2736371Z   local time: Mon Dec 23 14:20:40 UTC 2019
2019-12-23T14:20:40.5587314Z   network time: Mon, 23 Dec 2019 14:20:40 GMT
2019-12-23T14:20:40.5587438Z == end clock drift check ==
2019-12-23T14:20:41.9447104Z 
2019-12-23T14:20:41.9548048Z ##[error]Bash exited with code '1'.
2019-12-23T14:20:41.9607682Z ##[section]Starting: Checkout
2019-12-23T14:20:41.9609448Z ==============================================================================
2019-12-23T14:20:41.9609504Z Task         : Get sources
2019-12-23T14:20:41.9609551Z 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_mir/const_eval/machine.rs

RalfJung · 2019-12-23T16:30:07Z

r=me with tidy happy and the nit fixed.

oli-obk · 2019-12-23T16:33:46Z

@bors r=RalfJung

bors · 2019-12-23T16:33:48Z

📌 Commit 3719f4b3b688b81808dbcf65431ba185ff32616f has been approved by RalfJung

bors · 2019-12-23T16:33:49Z

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

rust-highfive · 2019-12-23T17:46:06Z

The job x86_64-gnu-llvm-7 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-12-23T16:33:55.7709615Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-23T16:33:55.7893101Z ##[command]git config gc.auto 0
2019-12-23T16:33:55.7958134Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-23T16:33:55.8003961Z ##[command]git config --get-all http.proxy
2019-12-23T16:33:55.8141223Z ##[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/67327/merge:refs/remotes/pull/67327/merge
---
2019-12-23T17:34:30.8423923Z .................................................................................................... 1600/9427
2019-12-23T17:34:35.4878233Z .................................................................................................... 1700/9427
2019-12-23T17:34:46.1623434Z ...................................................F.................................i.............. 1800/9427
2019-12-23T17:34:53.8057770Z .................................................................................................... 1900/9427
2019-12-23T17:35:01.1617258Z ......................................................................iiiii......................... 2000/9427
2019-12-23T17:35:21.6466894Z .................................................................................................... 2200/9427
2019-12-23T17:35:24.0391725Z .................................................................................................... 2300/9427
2019-12-23T17:35:26.7675645Z .................................................................................................... 2400/9427
2019-12-23T17:35:39.9501862Z .................................................................................................... 2500/9427
---
2019-12-23T17:38:30.7342096Z .i...............i.................................................................................. 4900/9427
2019-12-23T17:38:40.6057452Z .................................................................................................... 5000/9427
2019-12-23T17:38:45.4932286Z .............................................i...................................................... 5100/9427
2019-12-23T17:38:55.2227973Z .................................................................................................... 5200/9427
2019-12-23T17:39:01.0498064Z ............ii.ii...........i....................................................................... 5300/9427
2019-12-23T17:39:10.2094398Z .................................................................................................... 5500/9427
2019-12-23T17:39:21.4029232Z ..............................................................................................i..... 5600/9427
2019-12-23T17:39:29.9663468Z .................................................................................................... 5700/9427
2019-12-23T17:39:35.1442823Z .................................................................................................... 5800/9427
2019-12-23T17:39:35.1442823Z .................................................................................................... 5800/9427
2019-12-23T17:39:44.8358977Z ..................................................................................ii...i..ii........ 5900/9427
2019-12-23T17:40:07.2813424Z .................................................................................................... 6100/9427
2019-12-23T17:40:14.8049293Z .................................................................................................... 6200/9427
2019-12-23T17:40:22.7599262Z .................................................................................................... 6300/9427
2019-12-23T17:40:22.7599262Z .................................................................................................... 6300/9427
2019-12-23T17:40:43.0326875Z .........i..ii...................................................................................... 6400/9427
2019-12-23T17:41:02.0919760Z .....................................................................................i.............. 6600/9427
2019-12-23T17:41:04.2141699Z .................................................................................................... 6700/9427
2019-12-23T17:41:06.5048898Z .....................................................................................i.............. 6800/9427
2019-12-23T17:41:09.1932144Z .................................................................................................... 6900/9427
---
2019-12-23T17:45:53.3599488Z 
2019-12-23T17:45:53.3600477Z ---- [ui] ui/consts/uninhabited-const-issue-61744.rs stdout ----
2019-12-23T17:45:53.3604636Z diff of stderr:
2019-12-23T17:45:53.3605813Z 
2019-12-23T17:45:53.3607243Z - error[E0391]: cycle detected when const-evaluating `hint_unreachable`
2019-12-23T17:45:53.3607814Z + error[E0080]: evaluation of constant value failed
2019-12-23T17:45:53.3608421Z 2   --> $DIR/uninhabited-const-issue-61744.rs:8:5
2019-12-23T17:45:53.3609752Z + LL |     hint_unreachable()
2019-12-23T17:45:53.3610820Z +    |     ------------------
2019-12-23T17:45:53.3611795Z +    |     |
2019-12-23T17:45:53.3611795Z +    |     |
2019-12-23T17:45:53.3613033Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3613715Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3614327Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3614861Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3616404Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3621144Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3623930Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3625215Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3626642Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3627797Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3628694Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3630077Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3630779Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3632643Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3633774Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3634346Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3634889Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3635414Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3635959Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3637224Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3637754Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3638768Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3639412Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3640519Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3641174Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3641724Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3642658Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3643473Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3646238Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3646945Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3647496Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3648705Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3649758Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3650414Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3651530Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3654093Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3654453Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3654763Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3655814Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3656170Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3656526Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3656833Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3658223Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3659014Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3659486Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3659881Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3660188Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3660493Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3660872Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3661179Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3661482Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3662954Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3663310Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3663622Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3664729Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3665060Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3665407Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3665754Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3666060Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3666401Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3666709Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3667023Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3667348Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3667656Z +    |     inside call to `hint_unreachable` at $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3667715Z + ...
2019-12-23T17:45:53.3667781Z 4 LL |     fake_type()
2019-12-23T17:45:53.3667878Z +    |     |
2019-12-23T17:45:53.3667933Z +    |     reached the configured maximum number of stack frames
2019-12-23T17:45:53.3667933Z +    |     reached the configured maximum number of stack frames
2019-12-23T17:45:53.3668276Z +    |     inside call to `fake_type::<!>` at $DIR/uninhabited-const-issue-61744.rs:8:5
2019-12-23T17:45:53.3668393Z + error: any use of this value will cause an error
2019-12-23T17:45:53.3668678Z +   --> $DIR/uninhabited-const-issue-61744.rs:12:36
2019-12-23T17:45:53.3668731Z 6    |
2019-12-23T17:45:53.3668731Z 6    |
2019-12-23T17:45:53.3668997Z - note: ...which requires const-evaluating `fake_type`...
2019-12-23T17:45:53.3669283Z -   --> $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3669343Z + LL |     const CONSTANT: i32 = unsafe { fake_type() };
2019-12-23T17:45:53.3669684Z +    |                                    |
2019-12-23T17:45:53.3669740Z +    |                                    referenced constant has errors
2019-12-23T17:45:53.3669788Z 9    |
2019-12-23T17:45:53.3670018Z - LL |     hint_unreachable()
2019-12-23T17:45:53.3670018Z - LL |     hint_unreachable()
2019-12-23T17:45:53.3670271Z -    |     ^^^^^^^^^^^^^^^^^^
2019-12-23T17:45:53.3670573Z -    = note: ...which again requires const-evaluating `hint_unreachable`, completing the cycle
2019-12-23T17:45:53.3670840Z - note: cycle used when const-evaluating `fake_type`
2019-12-23T17:45:53.3671342Z -   --> $DIR/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3671449Z + 
2019-12-23T17:45:53.3671515Z + error[E0080]: erroneous constant used
2019-12-23T17:45:53.3671873Z +   --> $DIR/uninhabited-const-issue-61744.rs:18:10
2019-12-23T17:45:53.3671938Z 15    |
2019-12-23T17:45:53.3671938Z 15    |
2019-12-23T17:45:53.3672221Z - LL |     hint_unreachable()
2019-12-23T17:45:53.3672532Z -    |     ^^^^^^^^^^^^^^^^^^
2019-12-23T17:45:53.3672588Z + LL |     dbg!(i32::CONSTANT);
2019-12-23T17:45:53.3672665Z +    |          ^^^^^^^^^^^^^ referenced constant has errors
2019-12-23T17:45:53.3673008Z - error: aborting due to previous error
2019-12-23T17:45:53.3673068Z + error: aborting due to 3 previous errors
2019-12-23T17:45:53.3673134Z 20 
2019-12-23T17:45:53.3673447Z - For more information about this error, try `rustc --explain E0391`.
2019-12-23T17:45:53.3673447Z - For more information about this error, try `rustc --explain E0391`.
2019-12-23T17:45:53.3673772Z + For more information about this error, try `rustc --explain E0080`.
2019-12-23T17:45:53.3673846Z 22 
2019-12-23T17:45:53.3673880Z 
2019-12-23T17:45:53.3673913Z 
2019-12-23T17:45:53.3673967Z The actual stderr differed from the expected stderr.
2019-12-23T17:45:53.3674398Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/uninhabited-const-issue-61744/uninhabited-const-issue-61744.stderr
2019-12-23T17:45:53.3674714Z To update references, rerun the tests and pass the `--bless` flag
2019-12-23T17:45:53.3675058Z To only update this specific test, also pass `--test-args consts/uninhabited-const-issue-61744.rs`
2019-12-23T17:45:53.3675171Z error: 1 errors occurred comparing output.
2019-12-23T17:45:53.3675223Z status: exit code: 1
2019-12-23T17:45:53.3675223Z status: exit code: 1
2019-12-23T17:45:53.3676248Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/uninhabited-const-issue-61744.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/uninhabited-const-issue-61744" "-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/uninhabited-const-issue-61744/auxiliary" "-A" "unused"
2019-12-23T17:45:53.3676662Z ------------------------------------------
2019-12-23T17:45:53.3676704Z 
2019-12-23T17:45:53.3676971Z ------------------------------------------
2019-12-23T17:45:53.3677042Z stderr:
---
2019-12-23T17:45:53.3716530Z    |     inside call to `hint_unreachable` at /checkout/src/test/ui/consts/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3716956Z    |     inside call to `hint_unreachable` at /checkout/src/test/ui/consts/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3717231Z    |     inside call to `hint_unreachable` at /checkout/src/test/ui/consts/uninhabited-const-issue-61744.rs:4:5
2019-12-23T17:45:53.3717280Z ...
2019-12-23T17:45:53.3717896Z LL |     fake_type() //~ ERROR cycle detected when const-evaluating `hint_unreachable` [E0391]
2019-12-23T17:45:53.3717990Z    |     |
2019-12-23T17:45:53.3718052Z    |     reached the configured maximum number of stack frames
2019-12-23T17:45:53.3718052Z    |     reached the configured maximum number of stack frames
2019-12-23T17:45:53.3718426Z    |     inside call to `fake_type::<!>` at /checkout/src/test/ui/consts/uninhabited-const-issue-61744.rs:8:5
2019-12-23T17:45:53.3718517Z error: any use of this value will cause an error
2019-12-23T17:45:53.3718821Z   --> /checkout/src/test/ui/consts/uninhabited-const-issue-61744.rs:12:36
2019-12-23T17:45:53.3718874Z    |
2019-12-23T17:45:53.3718874Z    |
2019-12-23T17:45:53.3718921Z LL |     const CONSTANT: i32 = unsafe { fake_type() };
2019-12-23T17:45:53.3719248Z    |                                    |
2019-12-23T17:45:53.3719298Z    |                                    referenced constant has errors
2019-12-23T17:45:53.3719369Z    |
2019-12-23T17:45:53.3719414Z    = note: `#[deny(const_err)]` on by default
---
2019-12-23T17:45:53.3721323Z test result: FAILED. 9379 passed; 1 failed; 47 ignored; 0 measured; 0 filtered out
2019-12-23T17:45:53.3721359Z 
2019-12-23T17:45:53.3721441Z 
2019-12-23T17:45:53.3721469Z 
2019-12-23T17:45:53.3724236Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/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-7/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" "7.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-12-23T17:45:53.3724505Z 
2019-12-23T17:45:53.3724551Z 
2019-12-23T17:45:53.3724598Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-23T17:45:53.3724648Z Build completed unsuccessfully in 1:05:28
2019-12-23T17:45:53.3724648Z Build completed unsuccessfully in 1:05:28
2019-12-23T17:45:53.3725010Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:385:22
2019-12-23T17:45:53.3725221Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-23T17:45:53.3725271Z == clock drift check ==
2019-12-23T17:45:53.3725333Z   local time: Mon Dec 23 17:45:53 UTC 2019
2019-12-23T17:45:53.6565004Z   network time: Mon, 23 Dec 2019 17:45:53 GMT
2019-12-23T17:45:53.6574376Z == end clock drift check ==
2019-12-23T17:45:54.5834359Z 
2019-12-23T17:45:54.5934932Z ##[error]Bash exited with code '1'.
2019-12-23T17:45:54.5984177Z ##[section]Starting: Checkout
2019-12-23T17:45:54.5985920Z ==============================================================================
2019-12-23T17:45:54.5985977Z Task         : Get sources
2019-12-23T17:45:54.5986026Z 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-12-26T00:29:06Z

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

…gain

oli-obk · 2019-12-26T11:12:05Z

@bors r=RalfJung

bors · 2019-12-26T11:12:06Z

📌 Commit 07df147 has been approved by RalfJung

bors · 2019-12-26T13:15:10Z

⌛ Testing commit 07df147 with merge 3ac40b6...

@RalfJung

Split up `const_eval.rs` Fixes #67316 r? @RalfJung

bors · 2019-12-26T16:44:46Z

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing 3ac40b6 to master...

rust-highfive assigned RalfJung Dec 15, 2019

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

oli-obk commented Dec 15, 2019

View reviewed changes

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

RalfJung reviewed Dec 22, 2019

View reviewed changes

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

RalfJung reviewed Dec 23, 2019

View reviewed changes

src/bootstrap/compile.rs Outdated Show resolved Hide resolved

oli-obk force-pushed the cleanup branch from e8917c4 to 8a25701 Compare December 23, 2019 11:55

This comment has been minimized.

Sign in to view

RalfJung reviewed Dec 23, 2019

View reviewed changes

src/librustc_mir/const_eval/machine.rs 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 23, 2019

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 25, 2019

oli-obk added 14 commits December 26, 2019 12:10

Move const eval machine into its own module

3e7fa3c

Move const eval query components into their own module

2d67edd

Move eval_const_fn_call to the const_eval module

9a82458

Move eval_body_using_ecx to the only module it is used in

eda3fa9

Make some functions crate local

eea51e3

Move a function to make its adjacent impl block easier to discover

43221a6

Move all functions used by the queries to query.rs

e21d2c8

Move function definitions before their first use

4ffdd9a

Rename query module

d5f1d75

Fix imports after rebase

49f5b08

Tidy

b97abd0

Bail out before running the query

2e66f85

A cycle error on a diverging function is now a const stack overflow a…

7d5f36a

…gain

Rebase fallout

07df147

oli-obk force-pushed the cleanup branch from 8f349aa to 07df147 Compare December 26, 2019 11:11

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 Dec 26, 2019

bors added a commit that referenced this pull request Dec 26, 2019

Auto merge of #67327 - oli-obk:cleanup, r=RalfJung

3ac40b6

Split up `const_eval.rs` Fixes #67316 r? @RalfJung

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 26, 2019

bors merged commit 07df147 into rust-lang:master Dec 26, 2019

This was referenced Dec 26, 2019

libstd uses core::panic::Location where possible. #67137

Merged

const limit for CTFE #67260

Merged

Promoteds can contain raw pointers, but these must still only point to immutable allocations #67603

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split up `const_eval.rs` #67327

Split up `const_eval.rs` #67327

oli-obk commented Dec 15, 2019

Centril commented Dec 16, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

RalfJung commented Dec 22, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

bors commented Dec 22, 2019

RalfJung commented Dec 23, 2019

oli-obk commented Dec 23, 2019

RalfJung commented Dec 23, 2019

This comment has been minimized.

rust-highfive commented Dec 23, 2019

RalfJung commented Dec 23, 2019

oli-obk commented Dec 23, 2019

bors commented Dec 23, 2019

bors commented Dec 23, 2019

rust-highfive commented Dec 23, 2019

bors commented Dec 26, 2019

oli-obk commented Dec 26, 2019

bors commented Dec 26, 2019

bors commented Dec 26, 2019

bors commented Dec 26, 2019

Split up const_eval.rs #67327

Split up const_eval.rs #67327

Conversation

oli-obk commented Dec 15, 2019

Centril commented Dec 16, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

RalfJung commented Dec 22, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

RalfJung commented Dec 22, 2019

oli-obk commented Dec 22, 2019

bors commented Dec 22, 2019

RalfJung commented Dec 23, 2019

oli-obk commented Dec 23, 2019

RalfJung commented Dec 23, 2019

This comment has been minimized.

rust-highfive commented Dec 23, 2019

RalfJung commented Dec 23, 2019

oli-obk commented Dec 23, 2019

bors commented Dec 23, 2019

bors commented Dec 23, 2019

rust-highfive commented Dec 23, 2019

bors commented Dec 26, 2019

oli-obk commented Dec 26, 2019

bors commented Dec 26, 2019

bors commented Dec 26, 2019

bors commented Dec 26, 2019

Split up `const_eval.rs` #67327

Split up `const_eval.rs` #67327