Tweak the lint and add a Miri test

Author: saethlin

compiler/rustc_lint/src/lints.rs

@@ -3956,6 +3956,6 @@ pub(crate) struct MalformedOnConstAttrLint {
 #[note("this method was used to add checks to the `Eq` derive macro")]
 pub(crate) struct EqInternalMethodImplemented;
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("this function could have the attribute #[rustc_panic_entrypoint]")]
 pub(crate) struct MissingPanicEntrypoint;

src/tools/miri/tests/fail/immediate-abort.rs

@@ -0,0 +1,16 @@
+// Test that when we call a function with #[rustc_panic_entrypoint], we encounter an abort and do
+// not actually execute the function. Immediate-aborting panics are implemented by a rewrite of such
+// functions, so this tests that the rewrite works with Miri.
+
+//@compile-flags: -Cpanic=immediate-abort -Zunstable-options
+
+#![feature(rustc_attrs)]
+
+fn main() {
+    panic_entrypoint();
+}
+
+#[rustc_panic_entrypoint]
+fn panic_entrypoint() {
+    println!("Hello!");
+}

src/tools/miri/tests/fail/immediate-abort.stderr

@@ -0,0 +1,84 @@
+error: the crate `core` was compiled with a panic strategy which is incompatible with `immediate-abort`
+
+
+Miri caused an ICE during evaluation. Here's the interpreter backtrace at the time of the panic:
+
+thread 'rustc' ($TID) panicked at src/tools/miri/src/diagnostics.rs:LL:CC:
+assertion failed: !span.is_dummy()
+stack backtrace:
+   0: __rustc::rust_begin_unwind
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/std/src/panicking.rs:LL:CC
+   1: core::panicking::panic_fmt
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/core/src/panicking.rs:LL:CC
+   2: core::panicking::panic
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/core/src/panicking.rs:LL:CC
+   3: miri::diagnostics::report_msg
+             at ./src/diagnostics.rs:LL:CC
+   4: <rustc_const_eval::interpret::eval_context::InterpCx<miri::machine::MiriMachine> as miri::diagnostics::EvalContextExt>::handle_ice
+             at ./src/diagnostics.rs:LL:CC
+   5: miri::eval::eval_entry::{closure#1}
+             at ./src/eval.rs:LL:CC
+   6: <core::result::Result<rustc_middle::mir::interpret::error::InterpResult<!>, alloc::boxed::Box<dyn core::any::Any + core::marker::Send>>>::unwrap_or_else
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/core/src/result.rs:LL:CC
+   7: miri::eval::eval_entry
+             at ./src/eval.rs:LL:CC
+   8: <miri::MiriCompilerCalls as rustc_driver_impl::Callbacks>::after_analysis
+             at ./src/bin/miri.rs:LL:CC
+   9: rustc_driver_impl::run_compiler::{closure#0}::{closure#2}
+             at /home/ben/rust/compiler/rustc_driver_impl/src/lib.rs:LL:CC
+  10: rustc_interface::passes::create_and_enter_global_ctxt::{closure#2}
+             at /home/ben/rust/compiler/rustc_interface/src/passes.rs:LL:CC
+  11: <rustc_middle::ty::context::GlobalCtxt>::enter::{closure#1}
+             at /home/ben/rust/compiler/rustc_middle/src/ty/context.rs:LL:CC
+  12: rustc_middle::ty::context::tls::enter_context::{closure#0}
+             at /home/ben/rust/compiler/rustc_middle/src/ty/context/tls.rs:LL:CC
+  13: <std::thread::local::LocalKey<core::cell::Cell<*const ()>>>::try_with
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/std/src/thread/local.rs:LL:CC
+  14: <std::thread::local::LocalKey<core::cell::Cell<*const ()>>>::with
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/std/src/thread/local.rs:LL:CC
+  15: rustc_middle::ty::context::tls::enter_context
+             at /home/ben/rust/compiler/rustc_middle/src/ty/context/tls.rs:LL:CC
+  16: <rustc_middle::ty::context::GlobalCtxt>::enter
+             at /home/ben/rust/compiler/rustc_middle/src/ty/context.rs:LL:CC
+  17: <rustc_middle::ty::context::TyCtxt>::create_global_ctxt
+             at /home/ben/rust/compiler/rustc_middle/src/ty/context.rs:LL:CC
+  18: rustc_interface::passes::create_and_enter_global_ctxt
+             at /home/ben/rust/compiler/rustc_interface/src/passes.rs:LL:CC
+  19: rustc_driver_impl::run_compiler::{closure#0}
+             at /home/ben/rust/compiler/rustc_driver_impl/src/lib.rs:LL:CC
+  20: rustc_interface::interface::run_compiler::{closure#1}::{closure#0}
+             at /home/ben/rust/compiler/rustc_interface/src/interface.rs:LL:CC
+  21: <core::panic::unwind_safe::AssertUnwindSafe<rustc_interface::interface::run_compiler<(), rustc_driver_impl::run_compiler::{closure#0}>::{closure#1}::{closure#0}> as core::ops::function::FnOnce<()>>::call_once
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/core/src/panic/unwind_safe.rs:LL:CC
+  22: std::panicking::catch_unwind::do_call
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/std/src/panicking.rs:LL:CC
+  23: std::panicking::catch_unwind
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/std/src/panicking.rs:LL:CC
+  24: std::panic::catch_unwind
+             at /rustc/9b1f8ff42d110b0ca138116745be921df5dc97e7/library/std/src/panic.rs:LL:CC
+  25: rustc_interface::interface::run_compiler::{closure#1}
+             at /home/ben/rust/compiler/rustc_interface/src/interface.rs:LL:CC
+  26: rustc_interface::util::run_in_thread_pool_with_globals::{closure#0}
+             at /home/ben/rust/compiler/rustc_interface/src/util.rs:LL:CC
+  27: rustc_interface::util::run_in_thread_with_globals::{closure#0}::{closure#0}::{closure#0}
+             at /home/ben/rust/compiler/rustc_interface/src/util.rs:LL:CC
+  28: <scoped_tls::ScopedKey<rustc_span::SessionGlobals>>::set
+             at CARGO_REGISTRY/.../lib.rs:LL:CC
+  29: rustc_span::create_session_globals_then
+             at /home/ben/rust/compiler/rustc_span/src/lib.rs:LL:CC
+  30: rustc_interface::util::run_in_thread_with_globals::{closure#0}::{closure#0}
+             at /home/ben/rust/compiler/rustc_interface/src/util.rs:LL:CC
+note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
+
+error: the compiler unexpectedly panicked. This is a bug
+
+note: using internal features is not supported and expected to cause internal compiler errors when used incorrectly
+
+note: rustc 1.95.0-dev running on x86_64-unknown-linux-gnu
+
+note: compiler flags: -Z ui-testing -C panic=immediate-abort -Z unstable-options
+
+query stack during panic:
+end of query stack
+error: aborting due to 1 previous error
+