bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix tests

Browse source
This commit is contained in:
bjorn3 2024-12-14 14:28:28 +00:00
parent 7738929097
commit b0cd37ea0e
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_smir/src/rustc_internal/mod.rs
View file

@ -314,7 +314,7 @@ macro_rules! run_driver {
($args:expr, $callback:expr $(, $with_tcx:ident)?) => {{ ($args:expr, $callback:expr $(, $with_tcx:ident)?) => {{
use rustc_driver::{Callbacks, Compilation, RunCompiler}; use rustc_driver::{Callbacks, Compilation, RunCompiler};
use rustc_middle::ty::TyCtxt; use rustc_middle::ty::TyCtxt;
use rustc_interface::{interface, Queries}; use rustc_interface::interface;
use stable_mir::CompilerError; use stable_mir::CompilerError;
use std::ops::ControlFlow; use std::ops::ControlFlow;

5
tests/ui-fulldeps/run-compiler-twice.rs
View file

@ -77,11 +77,10 @@ fn compile(code: String, output: PathBuf, sysroot: PathBuf, linker: Option<&Path
}; };
interface::run_compiler(config, |compiler| { interface::run_compiler(config, |compiler| {
let linker = compiler.enter(|queries| { let krate = rustc_interface::passes::parse(&compiler.sess);
queries.global_ctxt().enter(|tcx| { let linker = rustc_interface::create_and_enter_global_ctxt(&compiler, krate, |tcx| {
let _ = tcx.analysis(()); let _ = tcx.analysis(());
Linker::codegen_and_build_linker(tcx, &*compiler.codegen_backend) Linker::codegen_and_build_linker(tcx, &*compiler.codegen_backend)
})
}); });
linker.link(&compiler.sess, &*compiler.codegen_backend); linker.link(&compiler.sess, &*compiler.codegen_backend);
}); });