Skip to content

Commit 23547bc

Browse files
saethlinsaethlin
committed
Infer nounwind and use it in MIR opts
1 parent 62c5f58 commit 23547bc

35 files changed

+113
-76
lines changed

‎compiler/rustc_interface/src/passes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ fn run_required_analyses(tcx: TyCtxt<'_>) {
980980
});
981981
sess.time("MIR_effect_checking", || {
982982
tcx.par_hir_body_owners(|def_id| {
983-
tcx.ensure_ok().has_ffi_unwind_calls(def_id);
983+
tcx.ensure_ok().mir_flags(def_id);
984984

985985
// If we need to codegen, ensure that we emit all errors from
986986
// `mir_drops_elaborated_and_const_checked` now, to avoid discovering

‎compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ provide! { tcx, def_id, other, cdata,
341341
is_mir_available => { cdata.is_item_mir_available(def_id.index) }
342342
is_ctfe_mir_available => { cdata.is_ctfe_mir_available(def_id.index) }
343343
cross_crate_inlinable => { table_direct }
344+
mir_flags => { table_direct }
344345

345346
dylib_dependency_formats => { cdata.get_dylib_dependency_formats(tcx) }
346347
is_private_dep => { cdata.private_dep }

‎compiler/rustc_metadata/src/rmeta/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerFile;
2626
use rustc_middle::middle::exported_symbols::{ExportedSymbol, SymbolExportInfo};
2727
use rustc_middle::middle::lib_features::FeatureStability;
2828
use rustc_middle::middle::resolve_bound_vars::ObjectLifetimeDefault;
29+
use rustc_middle::mir::MirFlags;
2930
use rustc_middle::ty::fast_reject::SimplifiedType;
3031
use rustc_middle::ty::{
3132
self, DeducedParamAttrs, ParameterizedOverTcx, Ty, TyCtxt, UnusedGenericParams,
@@ -408,6 +409,7 @@ define_tables! {
408409
// individually instead of `DefId`s.
409410
module_children_reexports: Table<DefIndex, LazyArray<ModChild>>,
410411
cross_crate_inlinable: Table<DefIndex, bool>,
412+
mir_flags: Table<DefIndex, MirFlags>,
411413

412414
- optional:
413415
attributes: Table<DefIndex, LazyArray<hir::Attribute>>,

‎compiler/rustc_metadata/src/rmeta/table.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ impl IsDefault for UnusedGenericParams {
5353
}
5454
}
5555

56+
impl IsDefault for MirFlags {
57+
fn is_default(&self) -> bool {
58+
*self == Self::default()
59+
}
60+
}
61+
5662
/// Helper trait, for encoding to, and decoding from, a fixed number of bytes.
5763
/// Used mainly for Lazy positions and lengths.
5864
/// Unchecked invariant: `Self::default()` should encode as `[0; BYTE_LEN]`,
@@ -291,6 +297,21 @@ impl FixedSizeEncoding for AttrFlags {
291297
}
292298
}
293299

300+
impl FixedSizeEncoding for MirFlags {
301+
type ByteArray = [u8; 1];
302+
303+
#[inline]
304+
fn from_bytes(b: &[u8; 1]) -> Self {
305+
MirFlags::from_bits_truncate(b[0])
306+
}
307+
308+
#[inline]
309+
fn write_to_bytes(self, b: &mut [u8; 1]) {
310+
debug_assert!(!self.is_default());
311+
b[0] = self.bits();
312+
}
313+
}
314+
294315
impl FixedSizeEncoding for bool {
295316
type ByteArray = [u8; 1];
296317

‎compiler/rustc_middle/src/mir/mod.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,6 +1691,16 @@ pub fn find_self_call<'tcx>(
16911691
None
16921692
}
16931693

1694+
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, TyEncodable, TyDecodable, HashStable)]
1695+
pub struct MirFlags(u8);
1696+
1697+
bitflags::bitflags! {
1698+
impl MirFlags: u8 {
1699+
const IS_NOUNWIND = 1 << 0;
1700+
const HAS_FFI_UNWIND_CALLS = 1 << 1;
1701+
}
1702+
}
1703+
16941704
// Some nodes are used a lot. Make sure they don't unintentionally get bigger.
16951705
#[cfg(target_pointer_width = "64")]
16961706
mod size_asserts {

‎compiler/rustc_middle/src/query/erase.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ trivial! {
296296
rustc_middle::middle::resolve_bound_vars::ResolvedArg,
297297
rustc_middle::middle::stability::DeprecationEntry,
298298
rustc_middle::mir::ConstQualifs,
299+
rustc_middle::mir::MirFlags,
299300
rustc_middle::mir::interpret::AllocId,
300301
rustc_middle::mir::interpret::CtfeProvenance,
301302
rustc_middle::mir::interpret::ErrorHandled,

‎compiler/rustc_middle/src/query/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ use crate::middle::lib_features::LibFeatures;
5656
use crate::middle::privacy::EffectiveVisibilities;
5757
use crate::middle::resolve_bound_vars::{ObjectLifetimeDefault, ResolveBoundVars, ResolvedArg};
5858
use crate::middle::stability::{self, DeprecationEntry};
59+
use crate::mir::MirFlags;
5960
use crate::mir::interpret::{
6061
EvalStaticInitializerRawResult, EvalToAllocationRawResult, EvalToConstValueResult,
6162
EvalToValTreeResult, GlobalId, LitToConstInput,
@@ -1741,9 +1742,10 @@ rustc_queries! {
17411742
desc { "checking if a crate is `#![profiler_runtime]`" }
17421743
separate_provide_extern
17431744
}
1744-
query has_ffi_unwind_calls(key: LocalDefId) -> bool {
1745-
desc { |tcx| "checking if `{}` contains FFI-unwind calls", tcx.def_path_str(key) }
1746-
cache_on_disk_if { true }
1745+
query mir_flags(key: DefId) -> MirFlags {
1746+
desc { |tcx| "stashing some local properties of `{}` before the body is stolen", tcx.def_path_str(key) }
1747+
cache_on_disk_if { key.is_local() }
1748+
separate_provide_extern
17471749
}
17481750
query required_panic_strategy(_: CrateNum) -> Option<PanicStrategy> {
17491751
fatal_cycle

‎compiler/rustc_middle/src/ty/context.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ use crate::metadata::ModChild;
6767
use crate::middle::codegen_fn_attrs::{CodegenFnAttrs, TargetFeature};
6868
use crate::middle::{resolve_bound_vars, stability};
6969
use crate::mir::interpret::{self, Allocation, ConstAllocation};
70-
use crate::mir::{Body, Local, Place, PlaceElem, ProjectionKind, Promoted};
70+
use crate::mir::{Body, Local, MirFlags, Place, PlaceElem, ProjectionKind, Promoted};
7171
use crate::query::plumbing::QuerySystem;
7272
use crate::query::{IntoQueryParam, LocalCrate, Providers, TyCtxtAt};
7373
use crate::thir::Thir;
@@ -3382,6 +3382,14 @@ impl<'tcx> TyCtxt<'tcx> {
33823382
}
33833383
}
33843384

3385+
pub fn is_nounwind(self, def_id: DefId) -> bool {
3386+
self.mir_flags(def_id).contains(MirFlags::IS_NOUNWIND)
3387+
}
3388+
3389+
pub fn has_ffi_unwind_calls(self, def_id: DefId) -> bool {
3390+
self.mir_flags(def_id).contains(MirFlags::HAS_FFI_UNWIND_CALLS)
3391+
}
3392+
33853393
/// Whether this is a trait implementation that has `#[diagnostic::do_not_recommend]`
33863394
pub fn do_not_recommend_impl(self, def_id: DefId) -> bool {
33873395
self.get_diagnostic_attr(def_id, sym::do_not_recommend).is_some()

‎compiler/rustc_middle/src/ty/parameterized.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ trivially_parameterized_over_tcx! {
102102
rustc_hir::PreciseCapturingArgKind<Symbol, Symbol>,
103103
rustc_index::bit_set::DenseBitSet<u32>,
104104
rustc_index::bit_set::FiniteBitSet<u32>,
105+
rustc_middle::mir::MirFlags,
105106
rustc_session::cstore::ForeignModule,
106107
rustc_session::cstore::LinkagePreference,
107108
rustc_session::cstore::NativeLib,

‎compiler/rustc_mir_transform/src/ffi_unwind_calls.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use rustc_abi::ExternAbi;
2-
use rustc_hir::def_id::{LOCAL_CRATE, LocalDefId};
2+
use rustc_hir::def_id::LOCAL_CRATE;
33
use rustc_middle::mir::*;
44
use rustc_middle::query::{LocalCrate, Providers};
55
use rustc_middle::ty::{self, TyCtxt, layout};
@@ -11,17 +11,10 @@ use tracing::debug;
1111
use crate::errors;
1212

1313
// Check if the body of this def_id can possibly leak a foreign unwind into Rust code.
14-
fn has_ffi_unwind_calls(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> bool {
15-
debug!("has_ffi_unwind_calls({local_def_id:?})");
14+
pub(crate) fn has_ffi_unwind_calls<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>) -> bool {
15+
let def_id = body.source.def_id();
1616

17-
// Only perform check on functions because constants cannot call FFI functions.
18-
let def_id = local_def_id.to_def_id();
19-
let kind = tcx.def_kind(def_id);
20-
if !kind.is_fn_like() {
21-
return false;
22-
}
23-
24-
let body = &*tcx.mir_built(local_def_id).borrow();
17+
debug!("has_ffi_unwind_calls({def_id:?})");
2518

2619
let body_ty = tcx.type_of(def_id).skip_binder();
2720
let body_abi = match body_ty.kind() {
@@ -110,7 +103,7 @@ fn required_panic_strategy(tcx: TyCtxt<'_>, _: LocalCrate) -> Option<PanicStrate
110103
}
111104

112105
for def_id in tcx.hir_body_owners() {
113-
if tcx.has_ffi_unwind_calls(def_id) {
106+
if tcx.has_ffi_unwind_calls(def_id.into()) {
114107
// Given that this crate is compiled in `-C panic=unwind`, the `AbortUnwindingCalls`
115108
// MIR pass will not be run on FFI-unwind call sites, therefore a foreign exception
116109
// can enter Rust through these sites.
@@ -141,5 +134,5 @@ fn required_panic_strategy(tcx: TyCtxt<'_>, _: LocalCrate) -> Option<PanicStrate
141134
}
142135

143136
pub(crate) fn provide(providers: &mut Providers) {
144-
*providers = Providers { has_ffi_unwind_calls, required_panic_strategy, ..*providers };
137+
*providers = Providers { required_panic_strategy, ..*providers };
145138
}

0 commit comments

Comments
 (0)