mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #1088 - RalfJung:globalctxt, r=RalfJung

Browse Source 
fix for GlobalCtxt changes

Blocked on https://github.com/rust-lang/rust/pull/66896
This commit is contained in:
bors 2019-12-01 09:30:00 +00:00
commit 33fe904547
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
benches/helpers/miri_helper.rs
View File

@ -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",
);

2
rust-version
View File

@ -1 +1 @@
809e180a76ce97340bf4354ff357bc59e3ca40b2
4007d4ef26eab44bdabc2b7574d032152264d3ad

6
src/bin/miri-rustc-tests.rs
View File

@ -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> {

6
src/bin/miri.rs
View File

@ -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();