Print a backtrace in const eval if interrupted by saethlin · Pull Request #111769 · rust-lang/rust

saethlin · 2023-05-19T20:05:04Z

Demo:

#![feature(const_eval_limit)]
#![const_eval_limit = "0"]

const OW: u64 = {
    let mut res: u64 = 0;
    let mut i = 0;
    while i < u64::MAX {
        res = res.wrapping_add(i);
        i += 1;
    }
    res
};

fn main() {
    println!("{}", OW);
}

╭ ➜ ben@archlinux:~/rust
╰ ➤ rustc +stage1 spin.rs 
^Cerror[E0080]: evaluation of constant value failed
 --> spin.rs:8:33
  |
8 |         res = res.wrapping_add(i);
  |                                 ^ Compilation was interrupted

note: erroneous constant used
  --> spin.rs:15:20
   |
15 |     println!("{}", OW);
   |                    ^^

note: erroneous constant used
  --> spin.rs:15:20
   |
15 |     println!("{}", OW);
   |                    ^^
   |
   = note: this note originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error

For more information about this error, try `rustc --explain E0080`.

rustbot · 2023-05-19T20:05:09Z

r? @Mark-Simulacrum

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

oli-obk · 2023-05-22T15:52:57Z

Yea, this is exactly what I wanted. Do any of the new deps have problematic licenses? Otherwise seems fine to just add them to the list of allowed crates.

saethlin · 2023-05-22T16:05:11Z

ctrlc is MIT or Apache-2.0, nix is MIT. I'll try to spruce up the implementation then get this reviewed.

Jynn said Mark has previously been uncomfortable with signal handlers or atexit code, so I'd prefer Mark approve this before it goes in (got lucky with the random selection I suppose).

Mark-Simulacrum

This seems broadly fine to me, my main concern here is that we don't write custom code where we need to be worried about signal safety etc to a great degree. But it seems like that's not being done here, which is good.

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

rustbot · 2023-05-22T20:37:55Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

saethlin · 2023-05-22T20:41:21Z

Just so everyone follows along, we recently added a mechanism like this to Miri: rust-lang/miri#2899

Since we ctrlc::set_hook inside rustc_driver::main, Miri should probably keep installing its own hook, but it might be nice to use the static inside rustc_*. cc @RalfJung (ah duh the bot has pinged you already, well now you know I really care about you knowing :p )

compiler/rustc_driver_impl/Cargo.toml

oli-obk · 2023-05-23T07:35:35Z

Miri should probably keep installing its own hook, but it might be nice to use the static inside rustc_*.

You could do this change in this PR, subtrees ftw

compiler/rustc_data_structures/src/lib.rs

RalfJung · 2023-05-23T10:06:00Z

You could do this change in this PR, subtrees ftw

We should first push Miri changes to rustc though or else we'll get conflicts.

bors · 2023-05-24T00:49:42Z

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

rustbot · 2023-05-24T03:02:06Z

The Miri subtree was changed

cc @rust-lang/miri

compiler/rustc_middle/src/mir/interpret/error.rs

RalfJung · 2023-05-25T07:42:34Z

r=me on the interpreter changes. Do we still need to get some approval for the new rustc dependencies?

bors · 2023-05-25T09:21:24Z

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

saethlin · 2023-05-25T23:21:38Z

I'm happy to wait for @Mark-Simulacrum to swing by again and offer an opinion :)

Mark-Simulacrum · 2023-05-29T14:29:15Z

@bors r=RalfJung

bors · 2023-05-29T14:29:17Z

📌 Commit 38a5fee has been approved by RalfJung

It is now in the queue for this repository.

bors · 2024-03-09T02:31:49Z

⌛ Trying commit 64cbfac with merge 0f63e28...

bors · 2024-03-09T04:00:20Z

💔 Test failed - checks-actions

saethlin · 2024-03-09T21:42:51Z

CI failed (because I added a dist job to CI) but the freebsd dist build finished, which is what held us up last time.

I didn't want to put something in the bors queue that will just fail, because the queue is so busy right now. If this doesn't work, I'm just going to reimplement ctrlc on top of libc instead of using nix because that crate has been so much trouble.

bors · 2024-03-10T14:39:10Z

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

saethlin · 2024-03-10T17:55:42Z

There's been no changes to the actual code in this PR, other than bumping the ctrlc version. Let's try again.

@bors r=RalfJung

bors · 2024-03-10T17:55:45Z

📌 Commit f7bf976 has been approved by RalfJung

It is now in the queue for this repository.

RalfJung · 2024-03-10T18:08:11Z

Cargo.lock

 dependencies = [
 "cfg-if",
- "windows-targets 0.52.4",
+ "windows-targets 0.48.5",


Why did this get downgraded?

rebase mistake probably.

RalfJung · 2024-03-10T18:10:30Z

compiler/rustc_data_structures/src/lib.rs

+/// `rustc_driver::main` installs a handler that will set this to `true` if
+/// the compiler has been sent a request to shut down, such as by a Ctrl-C.
+/// This static is placed here so that it is available to all parts of the compiler.
+pub static CTRL_C_RECEIVED: AtomicBool = AtomicBool::new(false);


rustc_data_structures seems like a strange place to put this. You're using this in rustc_const_eval and rustc_driver_impl. rustc_driver_impl depends on rustc_const_eval. Can't you put the static into rustc_const_eval?

RalfJung · 2024-03-10T18:11:32Z

src/tools/miri/src/concurrency/thread.rs

    fn run_threads(&mut self) -> InterpResult<'tcx, !> {
-        static SIGNALED: AtomicBool = AtomicBool::new(false);
+        // In normal rustc, rustc_driver::main installs this handler. But we don't use that
+        // function, see src/bin/miri.rs.


If this is a "thing the driver would do", then it probably makes more sense to install this in miri.rs than in the library.

Probably. I factored the installation into a rustc_driver function that we call in miri.rs.

RalfJung · 2024-03-10T18:12:34Z

Sorry, I came up with some more questions in the ~10 months since I wrote the previous r=me. ;)

RalfJung · 2024-03-10T18:12:44Z

@bors r-

RalfJung

r=me with some last nits, but we'll have to figure out this approval for the new dependency

compiler/rustc_driver_impl/src/lib.rs

src/tools/miri/src/bin/miri.rs

src/tools/tidy/src/deps.rs

RalfJung · 2024-03-11T08:22:39Z

I meant to ask about all the new dependencies, not just the one. :)

bors · 2024-03-17T09:18:13Z

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

rustbot · 2024-03-17T15:55:38Z

Some changes occurred in run-make tests.

cc @jieyouxu

saethlin · 2024-03-25T21:10:17Z

@bors r=RalfJung

bors · 2024-03-25T21:10:18Z

📌 Commit 9e0d1a3 has been approved by RalfJung

It is now in the queue for this repository.

bors · 2024-03-26T00:04:07Z

⌛ Testing commit 9e0d1a3 with merge c98ea0d...

bors · 2024-03-26T02:06:44Z

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing c98ea0d to master...

rust-timer · 2024-03-26T03:23:08Z

Finished benchmarking commit (c98ea0d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	4.3%	[3.4%, 5.1%]	2
Improvements ✅ (primary)	-1.6%	[-3.2%, -0.9%]	12
Improvements ✅ (secondary)	-2.3%	[-3.1%, -1.2%]	16
All ❌✅ (primary)	-1.6%	[-3.2%, -0.9%]	12

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-1.5%, -0.4%]	6
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.7%	[-1.5%, -0.4%]	6

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 671.315s -> 675.795s (0.67%)
Artifact size: 315.65 MiB -> 315.67 MiB (0.00%)

rust-log-analyzer · 2024-03-26T04:08:37Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

  PR_MESSAGE: Automation to keep dependencies in `Cargo.lock` current.
following is the output from `cargo update`:
  COMMIT_MESSAGE: cargo update 
##[endgroup]
Starting download for Cargo-lock
##[error]Unable to find any artifacts for the associated workflow

rustbot assigned Mark-Simulacrum May 19, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 19, 2023

This comment has been minimized.

Sign in to view

Mark-Simulacrum reviewed May 22, 2023

View reviewed changes

compiler/rustc_const_eval/src/const_eval/eval_queries.rs Outdated Show resolved Hide resolved

saethlin force-pushed the ctfe-backtrace-ctrlc branch from 8666de9 to a875a94 Compare May 22, 2023 20:26

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 22, 2023

saethlin marked this pull request as ready for review May 22, 2023 20:37

oli-obk reviewed May 23, 2023

View reviewed changes

compiler/rustc_driver_impl/Cargo.toml Outdated Show resolved Hide resolved

RalfJung reviewed May 23, 2023

View reviewed changes

compiler/rustc_data_structures/src/lib.rs Outdated Show resolved Hide resolved

saethlin force-pushed the ctfe-backtrace-ctrlc branch from a875a94 to 83d59c7 Compare May 23, 2023 13:24

saethlin force-pushed the ctfe-backtrace-ctrlc branch from 83d59c7 to f42df5f Compare May 24, 2023 03:02

RalfJung reviewed May 24, 2023

View reviewed changes

compiler/rustc_middle/src/mir/interpret/error.rs Outdated Show resolved Hide resolved

saethlin force-pushed the ctfe-backtrace-ctrlc branch from f42df5f to cf2055b Compare May 24, 2023 21:52

saethlin force-pushed the ctfe-backtrace-ctrlc branch from cf2055b to 38a5fee Compare May 25, 2023 12:07

This comment has been minimized.

Sign in to view

RalfJung reviewed Mar 10, 2024

View reviewed changes

compiler/rustc_driver_impl/src/lib.rs Outdated Show resolved Hide resolved

src/tools/miri/src/bin/miri.rs Outdated Show resolved Hide resolved

src/tools/tidy/src/deps.rs Show resolved Hide resolved

Print a backtrace in const eval if interrupted

9e0d1a3

saethlin mentioned this pull request Mar 18, 2024

Weekly cargo update #122611

Merged

bors mentioned this pull request Mar 26, 2024

Delay interning errors to after validation #122684

Merged

RalfJung mentioned this pull request Apr 20, 2024

The compiler keeps going on Ctrl-C #124212

Closed

bjorn3 mentioned this pull request Apr 22, 2024

Rustc reports error on Ctrl-C during linking #124265

Open

bjorn3 mentioned this pull request May 24, 2024

Compiling this code caused the compiler to block #125428

Open

Uh oh!

Conversation

saethlin commented May 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented May 19, 2023

Uh oh!

This comment has been minimized.

oli-obk commented May 22, 2023

Uh oh!

saethlin commented May 22, 2023

Uh oh!

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustbot commented May 22, 2023

Uh oh!

saethlin commented May 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

oli-obk commented May 23, 2023

Uh oh!

Uh oh!

RalfJung commented May 23, 2023

Uh oh!

bors commented May 24, 2023

Uh oh!

rustbot commented May 24, 2023

Uh oh!

Uh oh!

RalfJung commented May 25, 2023

Uh oh!

bors commented May 25, 2023

Uh oh!

saethlin commented May 25, 2023

Uh oh!

Mark-Simulacrum commented May 29, 2023

Uh oh!

bors commented May 29, 2023

Uh oh!

bors commented Mar 9, 2024

Uh oh!

This comment has been minimized.

bors commented Mar 9, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

saethlin commented Mar 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Mar 10, 2024

Uh oh!

saethlin commented Mar 10, 2024

Uh oh!

bors commented Mar 10, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RalfJung commented Mar 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Mar 10, 2024

Uh oh!

RalfJung left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

saethlin commented May 19, 2023 •

edited

Loading

saethlin commented May 22, 2023 •

edited

Loading

saethlin commented Mar 9, 2024 •

edited

Loading

RalfJung commented Mar 10, 2024 •

edited

Loading