Auto merge of #90406 - nbdd0121:panic, r=cjgillot
Collect `panic/panic_bounds_check` during monomorphization This would prevent link time errors if these functions are `#[inline]` (e.g. when `panic_immediate_abort` is used). Fix #90405 Fix rust-lang/cargo#10019 `@rustbot` label: T-compiler A-codegen
This commit is contained in:
commit
db062de72b
3 changed files with 71 additions and 4 deletions
|
@ -281,12 +281,12 @@ language_item_table! {
|
||||||
// in the sense that a crate is not required to have it defined to use it, but a final product
|
// in the sense that a crate is not required to have it defined to use it, but a final product
|
||||||
// is required to define it somewhere. Additionally, there are restrictions on crates that use
|
// is required to define it somewhere. Additionally, there are restrictions on crates that use
|
||||||
// a weak lang item, but do not have it defined.
|
// a weak lang item, but do not have it defined.
|
||||||
Panic, sym::panic, panic_fn, Target::Fn, GenericRequirement::None;
|
Panic, sym::panic, panic_fn, Target::Fn, GenericRequirement::Exact(0);
|
||||||
PanicFmt, sym::panic_fmt, panic_fmt, Target::Fn, GenericRequirement::None;
|
PanicFmt, sym::panic_fmt, panic_fmt, Target::Fn, GenericRequirement::None;
|
||||||
PanicDisplay, sym::panic_display, panic_display, Target::Fn, GenericRequirement::None;
|
PanicDisplay, sym::panic_display, panic_display, Target::Fn, GenericRequirement::None;
|
||||||
PanicStr, sym::panic_str, panic_str, Target::Fn, GenericRequirement::None;
|
PanicStr, sym::panic_str, panic_str, Target::Fn, GenericRequirement::None;
|
||||||
ConstPanicFmt, sym::const_panic_fmt, const_panic_fmt, Target::Fn, GenericRequirement::None;
|
ConstPanicFmt, sym::const_panic_fmt, const_panic_fmt, Target::Fn, GenericRequirement::None;
|
||||||
PanicBoundsCheck, sym::panic_bounds_check, panic_bounds_check_fn, Target::Fn, GenericRequirement::None;
|
PanicBoundsCheck, sym::panic_bounds_check, panic_bounds_check_fn, Target::Fn, GenericRequirement::Exact(0);
|
||||||
PanicInfo, sym::panic_info, panic_info, Target::Struct, GenericRequirement::None;
|
PanicInfo, sym::panic_info, panic_info, Target::Struct, GenericRequirement::None;
|
||||||
PanicLocation, sym::panic_location, panic_location, Target::Struct, GenericRequirement::None;
|
PanicLocation, sym::panic_location, panic_location, Target::Struct, GenericRequirement::None;
|
||||||
PanicImpl, sym::panic_impl, panic_impl, Target::Fn, GenericRequirement::None;
|
PanicImpl, sym::panic_impl, panic_impl, Target::Fn, GenericRequirement::None;
|
||||||
|
|
|
@ -806,13 +806,22 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mir::TerminatorKind::Assert { ref msg, .. } => {
|
||||||
|
let lang_item = match msg {
|
||||||
|
mir::AssertKind::BoundsCheck { .. } => LangItem::PanicBoundsCheck,
|
||||||
|
_ => LangItem::Panic,
|
||||||
|
};
|
||||||
|
let instance = Instance::mono(tcx, tcx.require_lang_item(lang_item, Some(source)));
|
||||||
|
if should_codegen_locally(tcx, &instance) {
|
||||||
|
self.output.push(create_fn_mono_item(tcx, instance, source));
|
||||||
|
}
|
||||||
|
}
|
||||||
mir::TerminatorKind::Goto { .. }
|
mir::TerminatorKind::Goto { .. }
|
||||||
| mir::TerminatorKind::SwitchInt { .. }
|
| mir::TerminatorKind::SwitchInt { .. }
|
||||||
| mir::TerminatorKind::Resume
|
| mir::TerminatorKind::Resume
|
||||||
| mir::TerminatorKind::Abort
|
| mir::TerminatorKind::Abort
|
||||||
| mir::TerminatorKind::Return
|
| mir::TerminatorKind::Return
|
||||||
| mir::TerminatorKind::Unreachable
|
| mir::TerminatorKind::Unreachable => {}
|
||||||
| mir::TerminatorKind::Assert { .. } => {}
|
|
||||||
mir::TerminatorKind::GeneratorDrop
|
mir::TerminatorKind::GeneratorDrop
|
||||||
| mir::TerminatorKind::Yield { .. }
|
| mir::TerminatorKind::Yield { .. }
|
||||||
| mir::TerminatorKind::FalseEdge { .. }
|
| mir::TerminatorKind::FalseEdge { .. }
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
// compile-flags:-Zprint-mono-items=lazy
|
||||||
|
|
||||||
|
// rust-lang/rust#90405
|
||||||
|
// Ensure implicit panic calls are collected
|
||||||
|
|
||||||
|
#![feature(lang_items)]
|
||||||
|
#![feature(no_core)]
|
||||||
|
#![crate_type = "lib"]
|
||||||
|
#![no_core]
|
||||||
|
#![no_std]
|
||||||
|
|
||||||
|
#[lang = "panic_location"]
|
||||||
|
struct Location<'a> {
|
||||||
|
_file: &'a str,
|
||||||
|
_line: u32,
|
||||||
|
_col: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[lang = "panic"]
|
||||||
|
#[inline]
|
||||||
|
#[track_caller]
|
||||||
|
fn panic(_: &'static str) -> ! {
|
||||||
|
loop {}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[lang = "sized"]
|
||||||
|
trait Sized {}
|
||||||
|
|
||||||
|
#[lang = "copy"]
|
||||||
|
trait Copy {}
|
||||||
|
|
||||||
|
#[lang = "freeze"]
|
||||||
|
trait Freeze {}
|
||||||
|
|
||||||
|
impl Copy for i32 {}
|
||||||
|
|
||||||
|
#[lang = "div"]
|
||||||
|
trait Div<Rhs = Self> {
|
||||||
|
type Output;
|
||||||
|
fn div(self, rhs: Rhs) -> Self::Output;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Div for i32 {
|
||||||
|
type Output = i32;
|
||||||
|
fn div(self, rhs: i32) -> i32 {
|
||||||
|
self / rhs
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(unconditional_panic)]
|
||||||
|
pub fn foo() {
|
||||||
|
// This implicitly generates a panic call.
|
||||||
|
let _ = 1 / 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
//~ MONO_ITEM fn foo
|
||||||
|
//~ MONO_ITEM fn <i32 as Div>::div
|
||||||
|
//~ MONO_ITEM fn panic
|
Loading…
Add table
Add a link
Reference in a new issue