Use `track_errors` instead of hand rolling #59358

JohnTitor · 2019-03-22T07:21:21Z

oli-obk · 2019-03-22T07:24:48Z

src/librustc_mir/const_eval.rs

@@ -647,10 +647,14 @@ pub fn const_eval_raw_provider<'a, 'tcx>(
                                                   "could not evaluate static initializer");
            // Ensure that if the above error was either `TooGeneric` or `Reported`
            // an error must be reported.
-            if tcx.sess.err_count() == 0 {
-                tcx.sess.delay_span_bug(err.span,
+            let errs = tcx.sess.track_errors(|| {


You should put the err.report_as_error(...) call above into the closure. We don't need the err_count call anymore, it's done by track_errors.

The idea was to ensure that calling report_as_error actually reports any errors.

You should then be able to yield the values inside the Err and Ok variants instead of having to carry the reported_err variable around

I get the point, removed err_count.

oli-obk · 2019-03-22T15:11:37Z

src/librustc_mir/const_eval.rs

-            if tcx.sess.err_count() == 0 {
-                tcx.sess.delay_span_bug(err.span,
+            let tracked_err = tcx.sess.track_errors(|| {
+                err.report_as_error(ecx.tcx,


You should remove the report_as_error call above. I'm not sure what types tracked_err has, but the Ok path should give you the same value that you got previously in reported_err. What's the value in the Err part?

Please let me ask you two questions.

What should I place instead of report_as_error?

How I check if track_err returns Ok?

for 2. you are already checking that via the match below. You can pattern match on the Ok value via Ok(reported_err).

for 1. nothing, you already are calling it inside of the track_errors call, so you are replacing it with the tcx.sess.track_errors(|| { err.report_as_error ....

Okay, thank you! And what should I do in the Err part?

I'm not sure, that depends on what is returned there. Have a look at the return type and emit an apropriate ErrorHandled enum variant

I pushed WIP commit. Test will be failed because types are incompatible in match.
But I want to know if my work is correct so far. Could you check this?

Yes, this is correct so far.

In the Ok arm, the return value should be v I believe. The Err pattern can probably be Err(ErrorReported) and the arm value ErrorHandled::Reported (or whatever the correct variant is).

I modified as follows:

match reported_err { Ok(v) => { tcx.sess.delay_span_bug(err.span, &format!("static eval failure did not emit an error: {:#?}", v)); v }, Err(ErrorReported) => ErrorReported, }

but () is returned in the Ok arm and rustc::util::common::ErrorReported is returned in the Err arm, so the compile is failed. Any solutions?

rust-highfive · 2019-03-24T06:05:49Z

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

Click to expand the log.

travis_time:end:0326c964:start=1553406409795269447,finish=1553406484147189549,duration=74351920102
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[00:13:33]    Compiling rustc_allocator v0.0.0 (/checkout/src/librustc_allocator)
[00:13:49] error[E0308]: match arms have incompatible types
[00:13:49]    --> src/librustc_mir/const_eval.rs:656:29
[00:13:49]     |
[00:13:49] 652 |  /             match reported_err {
[00:13:49] 653 |  |                 Ok(v) => tcx.sess.delay_span_bug(err.span,
[00:13:49]     |  |__________________________-
[00:13:49] 654 | ||                                         &format!("static eval failure did not emit an error: {:#?}",
[00:13:49] 655 | ||                                         v)),
[00:13:49]     | ||___________________________________________- this is found to be of type `()`
[00:13:49] 656 |  |                 Err(err) => err,
[00:13:49]     |  |                             ^^^ expected (), found struct `rustc::util::common::ErrorReported`
[00:13:49] 657 |  |             }
[00:13:49]     |  |_____________- `match` arms have incompatible types
[00:13:49]     = note: expected type `()`
[00:13:49]                found type `rustc::util::common::ErrorReported`
[00:13:49] 
[00:13:50] error: aborting due to previous error
---
travis_time:end:018e2810:start=1553407546471130127,finish=1553407546476492478,duration=5362351
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:15b45a97
$ 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:2a1c4b18
travis_time:start:2a1c4b18
$ 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 s

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-03-24T13:40:21Z

src/librustc_mir/const_eval.rs

-                tcx.sess.delay_span_bug(err.span,
+            let reported_err = tcx.sess.track_errors(|| {
+                err.report_as_error(ecx.tcx,
+                                    "could not evaluate static initializer");


The ; here drops the value you'd get for v and makes it ().

Removing the ; here should fix your problem

Thank you! I dropped ; but the compile was failed. However, the error message was changed.

error[E0308]: mismatched types==================================> ] 128/137: rustc_mir --> src/librustc_mir/const_eval.rs:657:21 | 657 | v | ^ expected (), found enum `rustc::mir::interpret::ErrorHandled` | = note: expected type `()` found type `rustc::mir::interpret::ErrorHandled`

related code is here:

if tcx.is_static(def_id).is_some() { // Ensure that if the above error was either `TooGeneric` or `Reported` // an error must be reported. let reported_err = tcx.sess.track_errors(|| { err.report_as_error(ecx.tcx, "could not evaluate static initializer") }); match reported_err { Ok(v) => { tcx.sess.delay_span_bug(err.span, &format!("static eval failure did not emit an error: {:#?}", v)); v }, Err(ErrorReported) => Err(ErrorHandled::Reported), } reported_err }

I tried to compile by changing value in the Ok or Err arm, but still failed, hmm... When () are returned in the Ok and Err, another error was occured.

The match isn't returning the values written in it, because you have a trailing expression (reported_err) afterwards. Removing that will make the match the trailing expression

I got it, modified and pushed.

rust-highfive · 2019-03-24T18:42:13Z

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

Click to expand the log.

travis_time:end:01dbc2c0:start=1553451669458924952,finish=1553451750264122637,duration=80805197685
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[00:15:28]    Compiling rustc_lint v0.0.0 (/checkout/src/librustc_lint)
[00:15:45] error: unused variable: `ErrorReported`
[00:15:45]    --> src/librustc_mir/const_eval.rs:657:21
[00:15:45]     |
[00:15:45] 657 |                 Err(ErrorReported) => ErrorHandled::Reported,
[00:15:45]     |                     ^^^^^^^^^^^^^ help: consider prefixing with an underscore: `_ErrorReported`
[00:15:45]     = note: `-D unused-variables` implied by `-D warnings`
[00:15:45] 
[00:15:45] error: aborting due to previous error
[00:15:45] 
---
travis_time:end:252e2d4c:start=1553452930727091633,finish=1553452930734893005,duration=7801372
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:08f99725
$ 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:083ae290
travis_time:start:083ae290
$ 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:02f51bec
$ 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)

src/librustc_mir/const_eval.rs

JohnTitor · 2019-03-28T15:10:02Z

@oli-obk Is there anything I can do?

src/librustc_mir/const_eval.rs

tesuji · 2019-03-28T18:41:40Z

@JohnTitor You might need to rebase on master. Now we have 384 commits in this PR.

JohnTitor · 2019-03-28T18:43:41Z

@lzutao yes, I'll fix.

JohnTitor · 2019-03-28T19:16:14Z

@oli-obk ~~Uh, if you allow me, I'd like to delete this branch and re-open PR, sorry...~~

EDIT: I cleaned up commit log successfully, I'm sorry for confusing you.

oli-obk · 2019-03-28T20:09:31Z

@bors r+

Thanks for doing this and seeing this through all the changes!

bors · 2019-03-28T20:09:32Z

📌 Commit 0778847 has been approved by oli-obk

@oli-obk

Use `track_errors` instead of hand rolling Fixes rust-lang#59215 r? @oli-obk

@ghost

Rollup of 11 pull requests Successful merges: - #58019 (Combine all builtin late lints and make lint checking parallel) - #59358 (Use `track_errors` instead of hand rolling) - #59394 (warn -> deny duplicate match bindings) - #59401 (bootstrap: build crates under libtest with -Z emit-stack-sizes) - #59423 (Visit path in `walk_mac`) - #59468 (musl: build toolchain libs with -fPIC) - #59476 (Use `SmallVec` in `TokenStreamBuilder`.) - #59496 (Remove unnecessary with_globals calls) - #59498 (Use 'write_all' instead of 'write' in example code) - #59503 (Stablize {f32,f64}::copysign().) - #59511 (Fix missed fn rename in #59284) Failed merges: r? @ghost

@ghost

Rollup of 11 pull requests Successful merges: - #58019 (Combine all builtin late lints and make lint checking parallel) - #59358 (Use `track_errors` instead of hand rolling) - #59394 (warn -> deny duplicate match bindings) - #59401 (bootstrap: build crates under libtest with -Z emit-stack-sizes) - #59423 (Visit path in `walk_mac`) - #59468 (musl: build toolchain libs with -fPIC) - #59476 (Use `SmallVec` in `TokenStreamBuilder`.) - #59496 (Remove unnecessary with_globals calls) - #59498 (Use 'write_all' instead of 'write' in example code) - #59503 (Stablize {f32,f64}::copysign().) - #59511 (Fix missed fn rename in #59284) Failed merges: r? @ghost

rust-highfive assigned oli-obk Mar 22, 2019

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

oli-obk reviewed Mar 22, 2019

View reviewed changes

oli-obk reviewed Mar 24, 2019

View reviewed changes

tesuji reviewed Mar 24, 2019

View reviewed changes

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

oli-obk reviewed Mar 28, 2019

View reviewed changes

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

JohnTitor force-pushed the use-track-errors branch 2 times, most recently from 4dc0279 to 169c320 Compare March 28, 2019 19:26

JohnTitor added 6 commits March 29, 2019 04:32

Use track_errors

3ba7454

Remove err_count

526b355

Set ok value

ee0e1b7

WIP: remove report_as_error

0e76b34

Return correct values

f0de8e8

Remove unused variable

6c8e3a5

JohnTitor force-pushed the use-track-errors branch 2 times, most recently from 76d457a to 6c8e3a5 Compare March 28, 2019 19:41

Use ErrorReported

0778847

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

Centril added a commit to Centril/rust that referenced this pull request Mar 29, 2019

Rollup merge of rust-lang#59358 - JohnTitor:use-track-errors, r=oli-obk

97927da

Use `track_errors` instead of hand rolling Fixes rust-lang#59215 r? @oli-obk

Centril mentioned this pull request Mar 29, 2019

Rollup of 11 pull requests #59513

Merged

bors merged commit 0778847 into rust-lang:master Mar 29, 2019

JohnTitor deleted the use-track-errors branch March 29, 2019 11:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use `track_errors` instead of hand rolling #59358

Use `track_errors` instead of hand rolling #59358

JohnTitor commented Mar 22, 2019

oli-obk Mar 22, 2019

JohnTitor Mar 22, 2019

oli-obk Mar 22, 2019

JohnTitor Mar 22, 2019

oli-obk Mar 22, 2019

JohnTitor Mar 22, 2019

oli-obk Mar 22, 2019

JohnTitor Mar 24, 2019

oli-obk Mar 24, 2019

JohnTitor Mar 24, 2019

rust-highfive commented Mar 24, 2019

oli-obk Mar 24, 2019

JohnTitor Mar 24, 2019 •

edited

Loading

oli-obk Mar 24, 2019

JohnTitor Mar 24, 2019

rust-highfive commented Mar 24, 2019

JohnTitor commented Mar 28, 2019

tesuji commented Mar 28, 2019

JohnTitor commented Mar 28, 2019

JohnTitor commented Mar 28, 2019 •

edited

Loading

oli-obk commented Mar 28, 2019

bors commented Mar 28, 2019

Use track_errors instead of hand rolling #59358

Use track_errors instead of hand rolling #59358

Conversation

JohnTitor commented Mar 22, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rust-highfive commented Mar 24, 2019

Choose a reason for hiding this comment

JohnTitor Mar 24, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rust-highfive commented Mar 24, 2019

JohnTitor commented Mar 28, 2019

tesuji commented Mar 28, 2019

JohnTitor commented Mar 28, 2019

JohnTitor commented Mar 28, 2019 • edited Loading

oli-obk commented Mar 28, 2019

bors commented Mar 28, 2019

Use `track_errors` instead of hand rolling #59358

Use `track_errors` instead of hand rolling #59358

JohnTitor Mar 24, 2019 •

edited

Loading

JohnTitor commented Mar 28, 2019 •

edited

Loading