-1c858ba5bf7bd06c1a970efbf77053c8380b3151
+c5cbf7852a7692c7c51df64c09a59e7838b55202
// used for everything, we only apply it to the parts of rustc that are
// CTFE-related. Otherwise, we use it verbatim for `RUSTC_LOG`.
// This way, if you set `MIRI_LOG=trace`, you get only the right parts of
- // rustc traced, but you can also do `MIRI_LOG=miri=trace,rustc_mir::interpret=debug`.
+ // rustc traced, but you can also do `MIRI_LOG=miri=trace,rustc_const_eval::interpret=debug`.
if log::Level::from_str(&var).is_ok() {
env::set_var(
"RUSTC_LOG",
- &format!("rustc_middle::mir::interpret={0},rustc_mir::interpret={0}", var),
+ &format!(
+ "rustc_middle::mir::interpret={0},rustc_const_eval::interpret={0}",
+ var
+ ),
);
} else {
env::set_var("RUSTC_LOG", &var);
extern crate rustc_ast;
#[macro_use]
extern crate rustc_middle;
+extern crate rustc_const_eval;
extern crate rustc_data_structures;
extern crate rustc_hir;
extern crate rustc_index;
-extern crate rustc_mir;
extern crate rustc_session;
extern crate rustc_span;
extern crate rustc_target;
// Establish a "crate-wide prelude": we often import `crate::*`.
// Make all those symbols available in the same place as our own.
-pub use rustc_mir::interpret::*;
+pub use rustc_const_eval::interpret::*;
// Resolve ambiguity.
-pub use rustc_mir::interpret::{self, AllocMap, PlaceTy};
+pub use rustc_const_eval::interpret::{self, AllocMap, PlaceTy};
pub use crate::shims::dlsym::{Dlsym, EvalContextExt as _};
pub use crate::shims::env::{EnvVars, EvalContextExt as _};
#[inline(always)]
fn call_intrinsic(
- ecx: &mut rustc_mir::interpret::InterpCx<'mir, 'tcx, Self>,
+ ecx: &mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, Self>,
instance: ty::Instance<'tcx>,
args: &[OpTy<'tcx, Tag>],
ret: Option<(&PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
#[inline(always)]
fn binary_ptr_op(
- ecx: &rustc_mir::interpret::InterpCx<'mir, 'tcx, Self>,
+ ecx: &rustc_const_eval::interpret::InterpCx<'mir, 'tcx, Self>,
bin_op: mir::BinOp,
left: &ImmTy<'tcx, Tag>,
right: &ImmTy<'tcx, Tag>,
use std::ffi::{OsStr, OsString};
use std::io::ErrorKind;
+use rustc_const_eval::interpret::Pointer;
use rustc_data_structures::fx::FxHashMap;
use rustc_middle::ty::layout::LayoutOf;
-use rustc_mir::interpret::Pointer;
use rustc_target::abi::Size;
use crate::*;