about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-08-27 09:08:27 +0000
committerbors <bors@rust-lang.org>2018-08-27 09:08:27 +0000
commit291d958585296b39df0d8ecc785b8786e14cd523 (patch)
treeb0e145d7754a426f46a2e3567fcae8e45a1bec0c /src/test
parent7625c031670bf33e2fb23816736ff10aa2ee6733 (diff)
parent0972658578f779d5aa3a6b773a862dfb84949d84 (diff)
Auto merge of #53624 - Zoxc:ice-fix, r=oli-obk
Move with_globals setup from run_compiler to run

An alternative to https://github.com/rust-lang/rust/pull/53526

Note this breaks some miri stuff and clippy since they call `run_compiler` directly, and they now need to also call `with_globals ` cc @rust-lang/dev-tools

r? @oli-obk
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass-fulldeps/compiler-calls.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/run-pass-fulldeps/compiler-calls.rs b/src/test/run-pass-fulldeps/compiler-calls.rs
index baf9e0d5dc5..6283d054373 100644
--- a/src/test/run-pass-fulldeps/compiler-calls.rs
+++ b/src/test/run-pass-fulldeps/compiler-calls.rs
@@ -92,7 +92,9 @@ fn main() {
         let tc = TestCalls { count: &mut count };
         // we should never get use this filename, but lets make sure they are valid args.
         let args = vec!["compiler-calls".to_string(), "foo.rs".to_string()];
-        rustc_driver::run_compiler(&args, Box::new(tc), None, None);
+        syntax::with_globals(|| {
+            rustc_driver::run_compiler(&args, Box::new(tc), None, None);
+        });
     }
     assert_eq!(count, 30);
 }