Skip to content

Commit

Permalink
Auto merge of #98018 - scottmcm:miri-yeet, r=RalfJung
Browse files Browse the repository at this point in the history
Try out `yeet` in the MIR interpreter

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

r? `@oli-obk`
  • Loading branch information
bors committed Jun 12, 2022
2 parents 4153a2e + a6c6fa0 commit 546c826
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_const_eval/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Rust MIR: a lowered representation of Rust.
#![feature(trusted_len)]
#![feature(trusted_step)]
#![feature(try_blocks)]
#![feature(yeet_expr)]
#![recursion_limit = "256"]
#![allow(rustc::potential_query_instability)]

Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_middle/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
#![feature(decl_macro)]
#![feature(drain_filter)]
#![feature(intra_doc_pointers)]
#![feature(yeet_expr)]
#![recursion_limit = "512"]
#![allow(rustc::potential_query_instability)]

Expand Down
10 changes: 5 additions & 5 deletions compiler/rustc_middle/src/mir/interpret/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ macro_rules! err_machine_stop {
// In the `throw_*` macros, avoid `return` to make them work with `try {}`.
#[macro_export]
macro_rules! throw_unsup {
($($tt:tt)*) => { Err::<!, _>(err_unsup!($($tt)*))? };
($($tt:tt)*) => { do yeet err_unsup!($($tt)*) };
}

#[macro_export]
Expand All @@ -66,12 +66,12 @@ macro_rules! throw_unsup_format {

#[macro_export]
macro_rules! throw_inval {
($($tt:tt)*) => { Err::<!, _>(err_inval!($($tt)*))? };
($($tt:tt)*) => { do yeet err_inval!($($tt)*) };
}

#[macro_export]
macro_rules! throw_ub {
($($tt:tt)*) => { Err::<!, _>(err_ub!($($tt)*))? };
($($tt:tt)*) => { do yeet err_ub!($($tt)*) };
}

#[macro_export]
Expand All @@ -81,12 +81,12 @@ macro_rules! throw_ub_format {

#[macro_export]
macro_rules! throw_exhaust {
($($tt:tt)*) => { Err::<!, _>(err_exhaust!($($tt)*))? };
($($tt:tt)*) => { do yeet err_exhaust!($($tt)*) };
}

#[macro_export]
macro_rules! throw_machine_stop {
($($tt:tt)*) => { Err::<!, _>(err_machine_stop!($($tt)*))? };
($($tt:tt)*) => { do yeet err_machine_stop!($($tt)*) };
}

mod allocation;
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_mir_transform/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#![feature(option_get_or_insert_default)]
#![feature(trusted_step)]
#![feature(try_blocks)]
#![feature(yeet_expr)]
#![recursion_limit = "256"]

#[macro_use]
Expand Down

0 comments on commit 546c826

Please sign in to comment.