diff options
| author | Ralf Jung <post@ralfj.de> | 2019-06-27 11:36:01 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-06-27 13:23:34 +0200 |
| commit | fc918a395a0b8fa251f85fa85992ee8a0b0ed5e8 (patch) | |
| tree | 7814ee146a664e36b2a7d1a279836d1ac6ce63dd /src/librustc_mir/transform | |
| parent | d3e2cec29225a46298ec4ebf082f34ebd7cfeecf (diff) | |
| download | rust-fc918a395a0b8fa251f85fa85992ee8a0b0ed5e8.tar.gz rust-fc918a395a0b8fa251f85fa85992ee8a0b0ed5e8.zip | |
rename InterpretCx -> InterpCx
That's more consistent with InterpResult and InterpError.
Diffstat (limited to 'src/librustc_mir/transform')
| -rw-r--r-- | src/librustc_mir/transform/const_prop.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs index c7a2fdd9383..29480f88fce 100644 --- a/src/librustc_mir/transform/const_prop.rs +++ b/src/librustc_mir/transform/const_prop.rs @@ -23,7 +23,7 @@ use rustc::ty::layout::{ }; use crate::interpret::{ - self, InterpretCx, ScalarMaybeUndef, Immediate, OpTy, + self, InterpCx, ScalarMaybeUndef, Immediate, OpTy, ImmTy, MemoryKind, StackPopCleanup, LocalValue, LocalState, }; use crate::const_eval::{ @@ -117,7 +117,7 @@ type Const<'tcx> = OpTy<'tcx>; /// Finds optimization opportunities on the MIR. struct ConstPropagator<'mir, 'tcx> { - ecx: InterpretCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>, + ecx: InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>, tcx: TyCtxt<'tcx>, source: MirSource<'tcx>, can_const_prop: IndexVec<Local, bool>, @@ -202,7 +202,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> { // If the local is `Unitialized` or `Dead` then we haven't propagated a value into it. // - // `InterpretCx::access_local()` mostly takes care of this for us however, for ZSTs, + // `InterpCx::access_local()` mostly takes care of this for us however, for ZSTs, // it will synthesize a value for us. In doing so, that will cause the // `get_const(l).is_empty()` assert right before we call `set_const()` in `visit_statement` // to fail. |
