Skip to content

Commit efab03a

Browse files
committed
Merge from rustc
2 parents cc3e703 + e961939 commit efab03a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/bin/miri.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ use log::debug;
2222

2323
use rustc_data_structures::sync::Lrc;
2424
use rustc_driver::Compilation;
25-
use rustc_hir::{self as hir, def_id::LOCAL_CRATE, Node};
25+
use rustc_hir::{self as hir, Node};
2626
use rustc_interface::interface::Config;
2727
use rustc_middle::{
2828
middle::exported_symbols::{
2929
ExportedSymbol, SymbolExportInfo, SymbolExportKind, SymbolExportLevel,
3030
},
3131
ty::{query::ExternProviders, TyCtxt},
32+
query::LocalCrate,
3233
};
3334
use rustc_session::config::OptLevel;
3435

@@ -124,8 +125,7 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
124125
config.override_queries = Some(|_, local_providers, _| {
125126
// `exported_symbols` and `reachable_non_generics` provided by rustc always returns
126127
// an empty result if `tcx.sess.opts.output_types.should_codegen()` is false.
127-
local_providers.exported_symbols = |tcx, cnum| {
128-
assert_eq!(cnum, LOCAL_CRATE);
128+
local_providers.exported_symbols = |tcx, LocalCrate| {
129129
let reachable_set = tcx.with_stable_hashing_context(|hcx| {
130130
tcx.reachable_set(()).to_sorted(&hcx, true)
131131
});

0 commit comments

Comments
 (0)