rename begin_panic

Author: Kivooeo

compiler/rustc_const_eval/src/check_consts/check.rs

@@ -827,11 +827,11 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
 
                 // At this point, we are calling a function, `callee`, whose `DefId` is known...
 
-                // `begin_panic` and `#[rustc_const_panic_str]` functions accept generic
+                // `panic_with_payload` and `#[rustc_const_panic_str]` functions accept generic
                 // types other than str. Check to enforce that only str can be used in
                 // const-eval.
 
-                // const-eval of the `begin_panic` fn assumes the argument is `&str`
+                // const-eval of the `panic_with_payload` fn assumes the argument is `&str`
                 if tcx.is_lang_item(callee, LangItem::BeginPanic) {
                     match args[0].node.ty(&self.ccx.body.local_decls, tcx).kind() {
                         ty::Ref(_, ty, _) if ty.is_str() => {}

library/std/src/panic.rs

@@ -215,10 +215,10 @@ impl fmt::Display for PanicHookInfo<'_> {
 #[rustc_macro_transparency = "semitransparent"]
 pub macro panic_2015 {
     () => ({
-        $crate::rt::begin_panic("explicit panic")
+        $crate::rt::panic_with_payload("explicit panic")
     }),
     ($msg:expr $(,)?) => ({
-        $crate::rt::begin_panic($msg);
+        $crate::rt::panic_with_payload($msg);
     }),
     // Special-case the single-argument case for const_panic.
     ("{}", $arg:expr $(,)?) => ({
@@ -257,7 +257,7 @@ pub use crate::panicking::{set_hook, take_hook};
 #[track_caller]
 #[cfg_attr(not(test), rustc_diagnostic_item = "panic_any")]
 pub fn panic_any<M: 'static + Any + Send>(msg: M) -> ! {
-    crate::panicking::begin_panic(msg);
+    crate::panicking::panic_with_payload(msg);
 }
 
 #[stable(feature = "catch_unwind", since = "1.9.0")]

library/std/src/panicking.rs

@@ -29,7 +29,7 @@ use crate::{fmt, intrinsics, process, thread};
 
 // This forces codegen of the function called by panic!() inside the std crate, rather than in
 // downstream crates. Primarily this is useful for rustc's codegen tests, which rely on noticing
-// complete removal of panic from generated IR. Since begin_panic is inline(never), it's only
+// complete removal of panic from generated IR. Since panic_with_payload is inline(never), it's only
 // codegen'd once per crate-graph so this pushes that to std rather than our codegen test crates.
 //
 // (See https://github.com/rust-lang/rust/pull/123244 for more info on why).
@@ -41,7 +41,7 @@ use crate::{fmt, intrinsics, process, thread};
 #[allow(dead_code)]
 #[used(compiler)]
 pub static EMPTY_PANIC: fn(&'static str) -> ! =
-    begin_panic::<&'static str> as fn(&'static str) -> !;
+    panic_with_payload::<&'static str> as fn(&'static str) -> !;
 
 // Binary interface to the panic runtime that the standard library depends on.
 //
@@ -650,7 +650,7 @@ pub fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
         fn take_box(&mut self) -> *mut (dyn Any + Send) {
             // We do two allocations here, unfortunately. But (a) they're required with the current
             // scheme, and (b) we don't handle panic + OOM properly anyway (see comment in
-            // begin_panic below).
+            // panic_with_payload below).
             let contents = mem::take(self.fill());
             Box::into_raw(Box::new(contents))
         }
@@ -725,7 +725,7 @@ pub fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
 #[cfg_attr(feature = "panic_immediate_abort", inline)]
 #[track_caller]
 #[rustc_do_not_const_check] // hooked by const-eval
-pub const fn begin_panic<M: Any + Send>(msg: M) -> ! {
+pub const fn panic_with_payload<M: Any + Send>(msg: M) -> ! {
     if cfg!(feature = "panic_immediate_abort") {
         intrinsics::abort()
     }

library/std/src/rt.rs

@@ -17,7 +17,7 @@
 #![allow(unused_macros)]
 
 #[rustfmt::skip]
-pub use crate::panicking::{begin_panic, panic_count};
+pub use crate::panicking::{panic_with_payload, panic_count};
 pub use core::panicking::{panic_display, panic_fmt};
 
 #[rustfmt::skip]

src/tools/clippy/clippy_lints/src/fallible_impl_from.rs

@@ -103,7 +103,7 @@ fn lint_impl_body(cx: &LateContext<'_>, item_def_id: hir::OwnerId, impl_span: Sp
     {
         let impl_item_def_id = impl_item.def_id.expect_local();
 
-        // check the body for `begin_panic` or `unwrap`
+        // check the body for `panic_with_payload` or `unwrap`
         let body = cx.tcx.hir_body_owned_by(impl_item_def_id);
         let mut fpu = FindPanicUnwrap {
             lcx: cx,

tests/mir-opt/building/issue_101867.main.built.after.mir

@@ -33,7 +33,7 @@ fn main() -> () {
     bb1: {
         StorageLive(_3);
         StorageLive(_4);
-        _4 = begin_panic::<&str>(const "explicit panic") -> bb8;
+        _4 = panic_with_payload::<&str>(const "explicit panic") -> bb8;
     }
 
     bb2: {

tests/mir-opt/const_prop/control_flow_simplification.hello.GVN.panic-abort.diff

@@ -15,7 +15,7 @@
       }
 
       bb1: {
-          _2 = begin_panic::<&str>(const "explicit panic") -> unwind unreachable;
+          _2 = panic_with_payload::<&str>(const "explicit panic") -> unwind unreachable;
       }
 
       bb2: {

tests/mir-opt/const_prop/control_flow_simplification.hello.GVN.panic-unwind.diff

@@ -15,7 +15,7 @@
       }
 
       bb1: {
-          _2 = begin_panic::<&str>(const "explicit panic") -> unwind continue;
+          _2 = panic_with_payload::<&str>(const "explicit panic") -> unwind continue;
       }
 
       bb2: {

tests/mir-opt/gvn.wrap_unwrap.GVN.panic-abort.diff

@@ -32,7 +32,7 @@
 
       bb2: {
           StorageLive(_6);
-          _6 = begin_panic::<&str>(const "explicit panic") -> unwind unreachable;
+          _6 = panic_with_payload::<&str>(const "explicit panic") -> unwind unreachable;
       }
 
       bb3: {

tests/mir-opt/gvn.wrap_unwrap.GVN.panic-unwind.diff

@@ -32,7 +32,7 @@
 
       bb2: {
           StorageLive(_6);
-          _6 = begin_panic::<&str>(const "explicit panic") -> unwind continue;
+          _6 = panic_with_payload::<&str>(const "explicit panic") -> unwind continue;
       }
 
       bb3: {