bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #121598 - RalfJung:catch_unwind, r=oli-obk

Browse source 
rename 'try' intrinsic to 'catch_unwind'

The intrinsic has nothing to do with `try` blocks, and corresponds to the stable `catch_unwind` function, so this makes a lot more sense IMO.

Also rename Miri's special function while we are at it, to reflect the level of abstraction it works on: it's an unwinding mechanism, on which Rust implements panics.
This commit is contained in:
Matthias Krüger 2024-02-27 00:40:00 +01:00 • committed by GitHub
commit d95c321062
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 67 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_hir_analysis/src/check/intrinsic.rs
View file

@ -12,7 +12,7 @@ use rustc_hir as hir;
use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_span::def_id::LocalDefId;
use rustc_span::symbol::{kw, sym};
use rustc_span::symbol::sym;
use rustc_span::{Span, Symbol};
use rustc_target::spec::abi::Abi;
@ -445,7 +445,7 @@ pub fn check_intrinsic_type(
)
}
kw::Try => {
sym::catch_unwind => {
let mut_u8 = Ty::new_mut_ptr(tcx, tcx.types.u8);
let try_fn_ty = ty::Binder::dummy(tcx.mk_fn_sig(
[mut_u8],