bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #98018 - scottmcm:miri-yeet, r=RalfJung

Browse source 
Try out `yeet` in the MIR interpreter

Since we got a new bootstrap, we can give this a shot.

r? `@oli-obk`
This commit is contained in:
bors 2022-06-12 20:44:58 +00:00
commit 546c826f0c
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_const_eval/src/lib.rs
View file

@ -20,6 +20,7 @@ Rust MIR: a lowered representation of Rust.
#![feature(trusted_len)] #![feature(trusted_len)]
#![feature(trusted_step)] #![feature(trusted_step)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(yeet_expr)]
#![recursion_limit = "256"] #![recursion_limit = "256"]
#![allow(rustc::potential_query_instability)] #![allow(rustc::potential_query_instability)]

1
compiler/rustc_middle/src/lib.rs
View file

@ -58,6 +58,7 @@
#![feature(decl_macro)] #![feature(decl_macro)]
#![feature(drain_filter)] #![feature(drain_filter)]
#![feature(intra_doc_pointers)] #![feature(intra_doc_pointers)]
#![feature(yeet_expr)]
#![recursion_limit = "512"] #![recursion_limit = "512"]
#![allow(rustc::potential_query_instability)] #![allow(rustc::potential_query_instability)]

10
compiler/rustc_middle/src/mir/interpret/mod.rs
View file

@ -56,7 +56,7 @@ macro_rules! err_machine_stop {
// In the `throw_*` macros, avoid `return` to make them work with `try {}`. // In the `throw_*` macros, avoid `return` to make them work with `try {}`.
#[macro_export] #[macro_export]
macro_rules! throw_unsup { macro_rules! throw_unsup {
($($tt:tt)*) => { Err::<!, _>(err_unsup!($($tt)*))? }; ($($tt:tt)*) => { do yeet err_unsup!($($tt)*) };
} }
#[macro_export] #[macro_export]
@ -66,12 +66,12 @@ macro_rules! throw_unsup_format {
#[macro_export] #[macro_export]
macro_rules! throw_inval { macro_rules! throw_inval {
($($tt:tt)*) => { Err::<!, _>(err_inval!($($tt)*))? }; ($($tt:tt)*) => { do yeet err_inval!($($tt)*) };
} }
#[macro_export] #[macro_export]
macro_rules! throw_ub { macro_rules! throw_ub {
($($tt:tt)*) => { Err::<!, _>(err_ub!($($tt)*))? }; ($($tt:tt)*) => { do yeet err_ub!($($tt)*) };
} }
#[macro_export] #[macro_export]
@ -81,12 +81,12 @@ macro_rules! throw_ub_format {
#[macro_export] #[macro_export]
macro_rules! throw_exhaust { macro_rules! throw_exhaust {
($($tt:tt)*) => { Err::<!, _>(err_exhaust!($($tt)*))? }; ($($tt:tt)*) => { do yeet err_exhaust!($($tt)*) };
} }
#[macro_export] #[macro_export]
macro_rules! throw_machine_stop { macro_rules! throw_machine_stop {
($($tt:tt)*) => { Err::<!, _>(err_machine_stop!($($tt)*))? }; ($($tt:tt)*) => { do yeet err_machine_stop!($($tt)*) };
} }
mod allocation; mod allocation;

1
compiler/rustc_mir_transform/src/lib.rs
View file

@ -9,6 +9,7 @@
#![feature(option_get_or_insert_default)] #![feature(option_get_or_insert_default)]
#![feature(trusted_step)] #![feature(trusted_step)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(yeet_expr)]
#![recursion_limit = "256"] #![recursion_limit = "256"]
#[macro_use] #[macro_use]