Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust test driver due to breaking changes #48

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Adjust test driver due to breaking changes #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions tools/test-drive/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@

mod sanity_checks;

extern crate rustc_driver;
extern crate rustc_interface;
extern crate rustc_middle;
extern crate rustc_smir;
extern crate stable_mir;

use rustc_middle::ty::TyCtxt;
use rustc_smir::rustc_internal;
use rustc_smir::{run, rustc_internal};
use stable_mir::CompilerError;
use std::ops::ControlFlow;
use std::panic::{catch_unwind, AssertUnwindSafe};
Expand Down Expand Up @@ -39,7 +41,7 @@ type TestResult = Result<(), String>;
fn main() -> ExitCode {
let args = std::env::args();
let (smir_args, rustc_args): (Vec<String>, _) = args.partition(|arg| arg.starts_with("--smir"));
let callback = if smir_args.contains(&CHECK_ARG.to_string()) {
let result = if smir_args.contains(&CHECK_ARG.to_string()) {
VERBOSE.store(
smir_args.contains(&VERBOSE_ARG.to_string()),
Ordering::Relaxed,
Expand All @@ -48,11 +50,10 @@ fn main() -> ExitCode {
smir_args.contains(&FIXME_ARG.to_string()),
Ordering::Relaxed,
);
test_stable_mir
run!(rustc_args, tcx, test_stable_mir(tcx))
} else {
|_: TyCtxt| ControlFlow::<()>::Continue(())
run!(rustc_args, ControlFlow::<()>::Continue(()))
};
let result = rustc_internal::StableMir::new(rustc_args, callback).run();
if result.is_ok() || matches!(result, Err(CompilerError::Skipped)) {
ExitCode::SUCCESS
} else {
Expand Down
6 changes: 3 additions & 3 deletions tools/test-drive/src/sanity_checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ pub fn test_crates() -> TestResult {

/// Visit all local types, statements and terminator to ensure nothing crashes.
fn check_body(body: stable_mir::mir::Body) {
for bb in body.blocks {
for stable_mir::mir::Statement { kind, .. } in bb.statements {
for bb in &body.blocks {
for stable_mir::mir::Statement { kind, .. } in &bb.statements {
black_box(matches!(kind, stable_mir::mir::StatementKind::Assign(..)));
}
black_box(matches!(
Expand All @@ -108,7 +108,7 @@ fn check_body(body: stable_mir::mir::Body) {
));
}

for local in body.locals {
for local in body.locals() {
black_box(matches!(local.ty.kind(), stable_mir::ty::TyKind::Alias(..)));
}
}
Loading