diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs
index a4f5599672..9514651350 100644
--- a/benches/helpers/miri_helper.rs
+++ b/benches/helpers/miri_helper.rs
@@ -7,7 +7,7 @@ extern crate test;
 
 use self::miri::eval_main;
 use rustc::hir::def_id::LOCAL_CRATE;
-use rustc_interface::interface;
+use rustc_interface::{interface, Queries};
 use rustc_driver::Compilation;
 use crate::test::Bencher;
 
@@ -16,10 +16,10 @@ struct MiriCompilerCalls<'a> {
 }
 
 impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
-    fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation {
+    fn after_analysis<'tcx>(&mut self, compiler: &interface::Compiler, queries: &'tcx Queries<'tcx>) -> Compilation {
         compiler.session().abort_if_errors();
 
-        compiler.global_ctxt().unwrap().peek_mut().enter(|tcx| {
+        queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             let (entry_def_id, _) = tcx.entry_fn(LOCAL_CRATE).expect(
                 "no main or start function found",
             );
diff --git a/rust-version b/rust-version
index b5ab3053c5..43425c9afc 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-809e180a76ce97340bf4354ff357bc59e3ca40b2
+4007d4ef26eab44bdabc2b7574d032152264d3ad
diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
index 920c925443..5e3f663de2 100644
--- a/src/bin/miri-rustc-tests.rs
+++ b/src/bin/miri-rustc-tests.rs
@@ -15,7 +15,7 @@ use std::sync::{Mutex, Arc};
 use std::io;
 
 
-use rustc_interface::interface;
+use rustc_interface::{interface, Queries};
 use rustc::hir::{self, itemlikevisit};
 use rustc::ty::TyCtxt;
 use rustc::hir::def_id::LOCAL_CRATE;
@@ -29,9 +29,9 @@ struct MiriCompilerCalls {
 }
 
 impl rustc_driver::Callbacks for MiriCompilerCalls {
-    fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation {
+    fn after_analysis<'tcx>(&mut self, compiler: &interface::Compiler, queries: &'tcx Queries<'tcx>) -> Compilation {
         compiler.session().abort_if_errors();
-        compiler.global_ctxt().unwrap().peek_mut().enter(|tcx| {
+        queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             if std::env::args().any(|arg| arg == "--test") {
                 struct Visitor<'tcx>(TyCtxt<'tcx>);
                 impl<'tcx, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'tcx> {
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 9e95e4b0a4..59cb19476a 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -20,7 +20,7 @@ use std::env;
 
 use hex::FromHexError;
 
-use rustc_interface::interface;
+use rustc_interface::{interface, Queries};
 use rustc::hir::def_id::LOCAL_CRATE;
 use rustc_driver::Compilation;
 
@@ -29,11 +29,11 @@ struct MiriCompilerCalls {
 }
 
 impl rustc_driver::Callbacks for MiriCompilerCalls {
-    fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation {
+    fn after_analysis<'tcx>(&mut self, compiler: &interface::Compiler, queries: &'tcx Queries<'tcx>) -> Compilation {
         init_late_loggers();
         compiler.session().abort_if_errors();
 
-        compiler.global_ctxt().unwrap().peek_mut().enter(|tcx| {
+        queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             let (entry_def_id, _) = tcx.entry_fn(LOCAL_CRATE).expect("no main function found!");
             let mut config = self.miri_config.clone();