Auto merge of #847 - RalfJung:rustup, r=RalfJung

[rust.git] / benches / helpers / miri_helper.rs

diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs
index 01fef16e4a9708a099f2b3e57a1849d8a170c22d..203a8b1133a5c5524ba1234f761c3a547d501cb8 100644 (file)
--- a/benches/helpers/miri_helper.rs
+++ b/benches/helpers/miri_helper.rs
@@ -8,6 +8,7 @@
 use self::miri::eval_main;
 use rustc::hir::def_id::LOCAL_CRATE;
 use rustc_interface::interface;
+use rustc_driver::Compilation;
 use crate::test::Bencher;
 
 struct MiriCompilerCalls<'a> {
@@ -15,7 +16,7 @@ struct MiriCompilerCalls<'a> {
 }
 
 impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
-    fn after_analysis(&mut self, compiler: &interface::Compiler) -> bool {
+    fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation {
         compiler.session().abort_if_errors();
 
         compiler.global_ctxt().unwrap().peek_mut().enter(|tcx| {
@@ -24,15 +25,14 @@ fn after_analysis(&mut self, compiler: &interface::Compiler) -> bool {
             );
 
             self.bencher.iter(|| {
-                let config = miri::MiriConfig { validate: true, args: vec![] };
+                let config = miri::MiriConfig { validate: true, args: vec![], seed: None };
                 eval_main(tcx, entry_def_id, config);
             });
         });
 
         compiler.session().abort_if_errors();
 
-        // Don't continue execution
-        false
+        Compilation::Stop
     }
 }