Rollup merge of #119833 - celinval:smir-accept-closures, r=oli-obk
Make tcx optional from StableMIR run macro and extend it to accept closures Change `run` macro to avoid sometimes unnecessary dependency on `TyCtxt`, and introduce `run_with_tcx` to capture use cases where `tcx` is required. Additionally, extend both macros to accept closures that may capture variables. I've also modified the `internal()` method to make it safer, by accepting the type context to force the `'tcx` lifetime to match the context lifetime. These are non-backward compatible changes, but they only affect internal APIs which are provided today as helper functions until we have a stable API to start the compiler.
This commit is contained in:
commit
c3e237c3ac
13 changed files with 141 additions and 65 deletions
|
@ -190,35 +190,120 @@ where
|
||||||
stable_mir::compiler_interface::run(&tables, || init(&tables, f))
|
stable_mir::compiler_interface::run(&tables, || init(&tables, f))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Instantiate and run the compiler with the provided arguments and callback.
|
||||||
|
///
|
||||||
|
/// The callback will be invoked after the compiler ran all its analyses, but before code generation.
|
||||||
|
/// Note that this macro accepts two different formats for the callback:
|
||||||
|
/// 1. An ident that resolves to a function that accepts no argument and returns `ControlFlow<B, C>`
|
||||||
|
/// ```ignore(needs-extern-crate)
|
||||||
|
/// # extern crate rustc_driver;
|
||||||
|
/// # extern crate rustc_interface;
|
||||||
|
/// # #[macro_use]
|
||||||
|
/// # extern crate rustc_smir;
|
||||||
|
/// # extern crate stable_mir;
|
||||||
|
/// #
|
||||||
|
/// # fn main() {
|
||||||
|
/// # use std::ops::ControlFlow;
|
||||||
|
/// # use stable_mir::CompilerError;
|
||||||
|
/// fn analyze_code() -> ControlFlow<(), ()> {
|
||||||
|
/// // Your code goes in here.
|
||||||
|
/// # ControlFlow::Continue(())
|
||||||
|
/// }
|
||||||
|
/// # let args = vec!["--verbose".to_string()];
|
||||||
|
/// let result = run!(args, analyze_code);
|
||||||
|
/// # assert_eq!(result, Err(CompilerError::Skipped))
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
/// 2. A closure expression:
|
||||||
|
/// ```ignore(needs-extern-crate)
|
||||||
|
/// # extern crate rustc_driver;
|
||||||
|
/// # extern crate rustc_interface;
|
||||||
|
/// # #[macro_use]
|
||||||
|
/// # extern crate rustc_smir;
|
||||||
|
/// # extern crate stable_mir;
|
||||||
|
/// #
|
||||||
|
/// # fn main() {
|
||||||
|
/// # use std::ops::ControlFlow;
|
||||||
|
/// # use stable_mir::CompilerError;
|
||||||
|
/// fn analyze_code(extra_args: Vec<String>) -> ControlFlow<(), ()> {
|
||||||
|
/// # let _ = extra_args;
|
||||||
|
/// // Your code goes in here.
|
||||||
|
/// # ControlFlow::Continue(())
|
||||||
|
/// }
|
||||||
|
/// # let args = vec!["--verbose".to_string()];
|
||||||
|
/// # let extra_args = vec![];
|
||||||
|
/// let result = run!(args, || analyze_code(extra_args));
|
||||||
|
/// # assert_eq!(result, Err(CompilerError::Skipped))
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
#[macro_export]
|
#[macro_export]
|
||||||
macro_rules! run {
|
macro_rules! run {
|
||||||
($args:expr, $callback:expr) => {
|
($args:expr, $callback_fn:ident) => {
|
||||||
run!($args, tcx, $callback)
|
run_driver!($args, || $callback_fn())
|
||||||
};
|
};
|
||||||
($args:expr, $tcx:ident, $callback:expr) => {{
|
($args:expr, $callback:expr) => {
|
||||||
|
run_driver!($args, $callback)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Instantiate and run the compiler with the provided arguments and callback.
|
||||||
|
///
|
||||||
|
/// This is similar to `run` but it invokes the callback with the compiler's `TyCtxt`,
|
||||||
|
/// which can be used to invoke internal APIs.
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! run_with_tcx {
|
||||||
|
($args:expr, $callback_fn:ident) => {
|
||||||
|
run_driver!($args, |tcx| $callback_fn(tcx), with_tcx)
|
||||||
|
};
|
||||||
|
($args:expr, $callback:expr) => {
|
||||||
|
run_driver!($args, $callback, with_tcx)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Optionally include an ident. This is needed due to macro hygiene.
|
||||||
|
#[macro_export]
|
||||||
|
#[doc(hidden)]
|
||||||
|
macro_rules! optional {
|
||||||
|
(with_tcx $ident:ident) => {
|
||||||
|
$ident
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Prefer using [run!] and [run_with_tcx] instead.
|
||||||
|
///
|
||||||
|
/// This macro implements the instantiation of a StableMIR driver, and it will invoke
|
||||||
|
/// the given callback after the compiler analyses.
|
||||||
|
///
|
||||||
|
/// The third argument determines whether the callback requires `tcx` as an argument.
|
||||||
|
#[macro_export]
|
||||||
|
#[doc(hidden)]
|
||||||
|
macro_rules! run_driver {
|
||||||
|
($args:expr, $callback:expr $(, $with_tcx:ident)?) => {{
|
||||||
use rustc_driver::{Callbacks, Compilation, RunCompiler};
|
use rustc_driver::{Callbacks, Compilation, RunCompiler};
|
||||||
use rustc_interface::{interface, Queries};
|
use rustc_interface::{interface, Queries};
|
||||||
use stable_mir::CompilerError;
|
use stable_mir::CompilerError;
|
||||||
use std::ops::ControlFlow;
|
use std::ops::ControlFlow;
|
||||||
|
|
||||||
pub struct StableMir<B = (), C = ()>
|
pub struct StableMir<B = (), C = (), F = fn($(optional!($with_tcx TyCtxt))?) -> ControlFlow<B, C>>
|
||||||
where
|
where
|
||||||
B: Send,
|
B: Send,
|
||||||
C: Send,
|
C: Send,
|
||||||
|
F: FnOnce($(optional!($with_tcx TyCtxt))?) -> ControlFlow<B, C> + Send,
|
||||||
{
|
{
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
callback: fn(TyCtxt<'_>) -> ControlFlow<B, C>,
|
callback: Option<F>,
|
||||||
result: Option<ControlFlow<B, C>>,
|
result: Option<ControlFlow<B, C>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<B, C> StableMir<B, C>
|
impl<B, C, F> StableMir<B, C, F>
|
||||||
where
|
where
|
||||||
B: Send,
|
B: Send,
|
||||||
C: Send,
|
C: Send,
|
||||||
|
F: FnOnce($(optional!($with_tcx TyCtxt))?) -> ControlFlow<B, C> + Send,
|
||||||
{
|
{
|
||||||
/// Creates a new `StableMir` instance, with given test_function and arguments.
|
/// Creates a new `StableMir` instance, with given test_function and arguments.
|
||||||
pub fn new(args: Vec<String>, callback: fn(TyCtxt<'_>) -> ControlFlow<B, C>) -> Self {
|
pub fn new(args: Vec<String>, callback: F) -> Self {
|
||||||
StableMir { args, callback, result: None }
|
StableMir { args, callback: Some(callback), result: None }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Runs the compiler against given target and tests it with `test_function`
|
/// Runs the compiler against given target and tests it with `test_function`
|
||||||
|
@ -238,10 +323,11 @@ macro_rules! run {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<B, C> Callbacks for StableMir<B, C>
|
impl<B, C, F> Callbacks for StableMir<B, C, F>
|
||||||
where
|
where
|
||||||
B: Send,
|
B: Send,
|
||||||
C: Send,
|
C: Send,
|
||||||
|
F: FnOnce($(optional!($with_tcx TyCtxt))?) -> ControlFlow<B, C> + Send,
|
||||||
{
|
{
|
||||||
/// Called after analysis. Return value instructs the compiler whether to
|
/// Called after analysis. Return value instructs the compiler whether to
|
||||||
/// continue the compilation afterwards (defaults to `Compilation::Continue`)
|
/// continue the compilation afterwards (defaults to `Compilation::Continue`)
|
||||||
|
@ -251,20 +337,24 @@ macro_rules! run {
|
||||||
queries: &'tcx Queries<'tcx>,
|
queries: &'tcx Queries<'tcx>,
|
||||||
) -> Compilation {
|
) -> Compilation {
|
||||||
queries.global_ctxt().unwrap().enter(|tcx| {
|
queries.global_ctxt().unwrap().enter(|tcx| {
|
||||||
rustc_internal::run(tcx, || {
|
if let Some(callback) = self.callback.take() {
|
||||||
self.result = Some((self.callback)(tcx));
|
rustc_internal::run(tcx, || {
|
||||||
})
|
self.result = Some(callback($(optional!($with_tcx tcx))?));
|
||||||
.unwrap();
|
})
|
||||||
if self.result.as_ref().is_some_and(|val| val.is_continue()) {
|
.unwrap();
|
||||||
Compilation::Continue
|
if self.result.as_ref().is_some_and(|val| val.is_continue()) {
|
||||||
|
Compilation::Continue
|
||||||
|
} else {
|
||||||
|
Compilation::Stop
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
Compilation::Stop
|
Compilation::Continue
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StableMir::new($args, |$tcx| $callback).run()
|
StableMir::new($args, $callback).run()
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,14 +12,12 @@
|
||||||
#![feature(ascii_char, ascii_char_variants)]
|
#![feature(ascii_char, ascii_char_variants)]
|
||||||
|
|
||||||
extern crate rustc_hir;
|
extern crate rustc_hir;
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::abi::{ArgAbi, CallConvention, FieldsShape, PassMode, VariantsShape};
|
use stable_mir::abi::{ArgAbi, CallConvention, FieldsShape, PassMode, VariantsShape};
|
||||||
use stable_mir::mir::mono::Instance;
|
use stable_mir::mir::mono::Instance;
|
||||||
|
@ -32,7 +30,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_stable_mir(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_stable_mir() -> ControlFlow<()> {
|
||||||
// Find items in the local crate.
|
// Find items in the local crate.
|
||||||
let items = stable_mir::all_local_items();
|
let items = stable_mir::all_local_items();
|
||||||
|
|
||||||
|
@ -117,7 +115,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_stable_mir(tcx)).unwrap();
|
run!(args, test_stable_mir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -14,14 +14,12 @@
|
||||||
#![feature(ascii_char, ascii_char_variants)]
|
#![feature(ascii_char, ascii_char_variants)]
|
||||||
|
|
||||||
extern crate rustc_hir;
|
extern crate rustc_hir;
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::crate_def::CrateDef;
|
use stable_mir::crate_def::CrateDef;
|
||||||
use stable_mir::mir::alloc::GlobalAlloc;
|
use stable_mir::mir::alloc::GlobalAlloc;
|
||||||
|
@ -40,7 +38,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_stable_mir(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_stable_mir() -> ControlFlow<()> {
|
||||||
// Find items in the local crate.
|
// Find items in the local crate.
|
||||||
let items = stable_mir::all_local_items();
|
let items = stable_mir::all_local_items();
|
||||||
check_foo(*get_item(&items, (ItemKind::Static, "FOO")).unwrap());
|
check_foo(*get_item(&items, (ItemKind::Static, "FOO")).unwrap());
|
||||||
|
@ -230,7 +228,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_stable_mir(tcx)).unwrap();
|
run!(args, test_stable_mir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
|
@ -20,7 +19,6 @@ extern crate stable_mir;
|
||||||
|
|
||||||
use std::assert_matches::assert_matches;
|
use std::assert_matches::assert_matches;
|
||||||
use mir::{mono::Instance, TerminatorKind::*};
|
use mir::{mono::Instance, TerminatorKind::*};
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::ty::{RigidTy, TyKind, Ty, UintTy};
|
use stable_mir::ty::{RigidTy, TyKind, Ty, UintTy};
|
||||||
use stable_mir::*;
|
use stable_mir::*;
|
||||||
|
@ -30,7 +28,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_stable_mir(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_stable_mir() -> ControlFlow<()> {
|
||||||
let entry = stable_mir::entry_fn().unwrap();
|
let entry = stable_mir::entry_fn().unwrap();
|
||||||
let main_fn = Instance::try_from(entry).unwrap();
|
let main_fn = Instance::try_from(entry).unwrap();
|
||||||
assert_eq!(main_fn.name(), "main");
|
assert_eq!(main_fn.name(), "main");
|
||||||
|
@ -113,7 +111,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_stable_mir(tcx)).unwrap();
|
run!(args, test_stable_mir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
|
@ -19,7 +18,6 @@ extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use mir::{mono::Instance, TerminatorKind::*};
|
use mir::{mono::Instance, TerminatorKind::*};
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::ty::{RigidTy, TyKind};
|
use stable_mir::ty::{RigidTy, TyKind};
|
||||||
use stable_mir::*;
|
use stable_mir::*;
|
||||||
|
@ -29,7 +27,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_stable_mir(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_stable_mir() -> ControlFlow<()> {
|
||||||
let items = stable_mir::all_local_items();
|
let items = stable_mir::all_local_items();
|
||||||
|
|
||||||
// Get all items and split generic vs monomorphic items.
|
// Get all items and split generic vs monomorphic items.
|
||||||
|
@ -96,7 +94,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_stable_mir(tcx)).unwrap();
|
run!(args, test_stable_mir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -11,14 +11,12 @@
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::*;
|
use stable_mir::*;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
@ -27,7 +25,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_item_kind(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_item_kind() -> ControlFlow<()> {
|
||||||
let items = stable_mir::all_local_items();
|
let items = stable_mir::all_local_items();
|
||||||
assert_eq!(items.len(), 4);
|
assert_eq!(items.len(), 4);
|
||||||
// Constructor item.
|
// Constructor item.
|
||||||
|
@ -59,7 +57,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_item_kind(tcx)).unwrap();
|
run!(args, test_item_kind).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -11,14 +11,12 @@
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::CrateDef;
|
use stable_mir::CrateDef;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
|
@ -83,7 +81,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, test_traits()).unwrap();
|
run!(args, test_traits).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -12,14 +12,12 @@
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::ty::{RigidTy, TyKind, Ty, };
|
use stable_mir::ty::{RigidTy, TyKind, Ty, };
|
||||||
use stable_mir::mir::{Body, MirVisitor, FieldIdx, Place, ProjectionElem, visit::{Location,
|
use stable_mir::mir::{Body, MirVisitor, FieldIdx, Place, ProjectionElem, visit::{Location,
|
||||||
|
@ -30,7 +28,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_stable_mir(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_stable_mir() -> ControlFlow<()> {
|
||||||
let main_fn = stable_mir::entry_fn();
|
let main_fn = stable_mir::entry_fn();
|
||||||
let body = main_fn.unwrap().body();
|
let body = main_fn.unwrap().body();
|
||||||
let mut visitor = PlaceVisitor{ body: &body, tested: false};
|
let mut visitor = PlaceVisitor{ body: &body, tested: false};
|
||||||
|
@ -87,7 +85,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_stable_mir(tcx)).unwrap();
|
run!(args, test_stable_mir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -10,14 +10,12 @@
|
||||||
#![feature(rustc_private)]
|
#![feature(rustc_private)]
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
|
||||||
|
@ -32,33 +30,41 @@ fn main() {
|
||||||
test_continue(args.clone());
|
test_continue(args.clone());
|
||||||
test_break(args.clone());
|
test_break(args.clone());
|
||||||
test_failed(args.clone());
|
test_failed(args.clone());
|
||||||
test_skipped(args);
|
test_skipped(args.clone());
|
||||||
|
test_captured(args)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_continue(args: Vec<String>) {
|
fn test_continue(args: Vec<String>) {
|
||||||
let result = run!(args, ControlFlow::Continue::<(), bool>(true));
|
let result = run!(args, || ControlFlow::Continue::<(), bool>(true));
|
||||||
assert_eq!(result, Ok(true));
|
assert_eq!(result, Ok(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn test_break(args: Vec<String>) {
|
fn test_break(args: Vec<String>) {
|
||||||
let result = run!(args, ControlFlow::Break::<bool, i32>(false));
|
let result = run!(args, || ControlFlow::Break::<bool, i32>(false));
|
||||||
assert_eq!(result, Err(stable_mir::CompilerError::Interrupted(false)));
|
assert_eq!(result, Err(stable_mir::CompilerError::Interrupted(false)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unreachable_code)]
|
#[allow(unreachable_code)]
|
||||||
fn test_skipped(mut args: Vec<String>) {
|
fn test_skipped(mut args: Vec<String>) {
|
||||||
args.push("--version".to_string());
|
args.push("--version".to_string());
|
||||||
let result = run!(args, unreachable!() as ControlFlow<()>);
|
let result = run!(args, || unreachable!() as ControlFlow<()>);
|
||||||
assert_eq!(result, Err(stable_mir::CompilerError::Skipped));
|
assert_eq!(result, Err(stable_mir::CompilerError::Skipped));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unreachable_code)]
|
#[allow(unreachable_code)]
|
||||||
fn test_failed(mut args: Vec<String>) {
|
fn test_failed(mut args: Vec<String>) {
|
||||||
args.push("--cfg=broken".to_string());
|
args.push("--cfg=broken".to_string());
|
||||||
let result = run!(args, unreachable!() as ControlFlow<()>);
|
let result = run!(args, || unreachable!() as ControlFlow<()>);
|
||||||
assert_eq!(result, Err(stable_mir::CompilerError::CompilationFailed));
|
assert_eq!(result, Err(stable_mir::CompilerError::CompilationFailed));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Test that we are able to pass a closure and set the return according to the captured value.
|
||||||
|
fn test_captured(args: Vec<String>) {
|
||||||
|
let captured = "10".to_string();
|
||||||
|
let result = run!(args, || ControlFlow::Continue::<(), usize>(captured.len()));
|
||||||
|
assert_eq!(result, Ok(captured.len()));
|
||||||
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
let mut file = std::fs::File::create(path)?;
|
let mut file = std::fs::File::create(path)?;
|
||||||
write!(
|
write!(
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_hir;
|
extern crate rustc_hir;
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
|
@ -20,7 +19,6 @@ extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_hir::def::DefKind;
|
use rustc_hir::def::DefKind;
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::ItemKind;
|
use stable_mir::ItemKind;
|
||||||
use stable_mir::crate_def::CrateDef;
|
use stable_mir::crate_def::CrateDef;
|
||||||
|
@ -33,7 +31,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// This function uses the Stable MIR APIs to get information about the test crate.
|
/// This function uses the Stable MIR APIs to get information about the test crate.
|
||||||
fn test_stable_mir(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_stable_mir() -> ControlFlow<()> {
|
||||||
// Get the local crate using stable_mir API.
|
// Get the local crate using stable_mir API.
|
||||||
let local = stable_mir::local_crate();
|
let local = stable_mir::local_crate();
|
||||||
assert_eq!(&local.name, CRATE_NAME);
|
assert_eq!(&local.name, CRATE_NAME);
|
||||||
|
@ -194,7 +192,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_stable_mir(tcx)).unwrap();
|
run!(args, test_stable_mir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -12,14 +12,12 @@
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_hir;
|
extern crate rustc_hir;
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
extern crate rustc_interface;
|
extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::crate_def::CrateDef;
|
use stable_mir::crate_def::CrateDef;
|
||||||
use stable_mir::mir::{ProjectionElem, Rvalue, StatementKind};
|
use stable_mir::mir::{ProjectionElem, Rvalue, StatementKind};
|
||||||
|
@ -32,7 +30,7 @@ use std::ops::ControlFlow;
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
/// Tests projections within Place objects
|
/// Tests projections within Place objects
|
||||||
fn test_place_projections(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_place_projections() -> ControlFlow<()> {
|
||||||
let items = stable_mir::all_local_items();
|
let items = stable_mir::all_local_items();
|
||||||
let body = get_item(&items, (ItemKind::Fn, "projections")).unwrap().body();
|
let body = get_item(&items, (ItemKind::Fn, "projections")).unwrap().body();
|
||||||
assert_eq!(body.blocks.len(), 4);
|
assert_eq!(body.blocks.len(), 4);
|
||||||
|
@ -159,7 +157,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_place_projections(tcx)).unwrap();
|
run!(args, test_place_projections).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -26,7 +26,7 @@ use std::ops::ControlFlow;
|
||||||
|
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
fn test_translation(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_translation(_tcx: TyCtxt) -> ControlFlow<()> {
|
||||||
let main_fn = stable_mir::entry_fn().unwrap();
|
let main_fn = stable_mir::entry_fn().unwrap();
|
||||||
let body = main_fn.body();
|
let body = main_fn.body();
|
||||||
let orig_ty = body.locals()[0].ty;
|
let orig_ty = body.locals()[0].ty;
|
||||||
|
@ -48,7 +48,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_translation(tcx)).unwrap();
|
run_with_tcx!(args, test_translation).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#![feature(assert_matches)]
|
#![feature(assert_matches)]
|
||||||
#![feature(control_flow_enum)]
|
#![feature(control_flow_enum)]
|
||||||
|
|
||||||
extern crate rustc_middle;
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate rustc_smir;
|
extern crate rustc_smir;
|
||||||
extern crate rustc_driver;
|
extern crate rustc_driver;
|
||||||
|
@ -19,7 +18,6 @@ extern crate rustc_interface;
|
||||||
extern crate stable_mir;
|
extern crate stable_mir;
|
||||||
|
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use rustc_middle::ty::TyCtxt;
|
|
||||||
use rustc_smir::rustc_internal;
|
use rustc_smir::rustc_internal;
|
||||||
use stable_mir::*;
|
use stable_mir::*;
|
||||||
use stable_mir::mir::MirVisitor;
|
use stable_mir::mir::MirVisitor;
|
||||||
|
@ -28,7 +26,7 @@ use std::ops::ControlFlow;
|
||||||
|
|
||||||
const CRATE_NAME: &str = "input";
|
const CRATE_NAME: &str = "input";
|
||||||
|
|
||||||
fn test_visitor(_tcx: TyCtxt<'_>) -> ControlFlow<()> {
|
fn test_visitor() -> ControlFlow<()> {
|
||||||
let main_fn = stable_mir::entry_fn();
|
let main_fn = stable_mir::entry_fn();
|
||||||
let main_body = main_fn.unwrap().body();
|
let main_body = main_fn.unwrap().body();
|
||||||
let main_visitor = TestVisitor::collect(&main_body);
|
let main_visitor = TestVisitor::collect(&main_body);
|
||||||
|
@ -116,7 +114,7 @@ fn main() {
|
||||||
CRATE_NAME.to_string(),
|
CRATE_NAME.to_string(),
|
||||||
path.to_string(),
|
path.to_string(),
|
||||||
];
|
];
|
||||||
run!(args, tcx, test_visitor(tcx)).unwrap();
|
run!(args, test_visitor).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn generate_input(path: &str) -> std::io::Result<()> {
|
fn generate_input(path: &str) -> std::io::Result<()> {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue