diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2019-11-06 13:20:08 -0500 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2019-11-11 15:14:38 -0500 |
| commit | 2ed1e8970675c98e1464478f0fa7eb97e988835a (patch) | |
| tree | b400ea131ae429b9000efa335c250938b7a70cc1 | |
| parent | ee2dc4b7287a67a4e6299d61539b742d8f73f0a6 (diff) | |
| download | rust-2ed1e8970675c98e1464478f0fa7eb97e988835a.tar.gz rust-2ed1e8970675c98e1464478f0fa7eb97e988835a.zip | |
Rename to
| -rw-r--r-- | src/librustc_mir/const_eval.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/intrinsics.rs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs index e2d5eec6502..f280ea7aa46 100644 --- a/src/librustc_mir/const_eval.rs +++ b/src/librustc_mir/const_eval.rs @@ -337,7 +337,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, // Some functions we support even if they are non-const -- but avoid testing // that for const fn! We certainly do *not* want to actually call the fn // though, so be sure we return here. - return if ecx.hook_fn(instance, args, dest)? { + return if ecx.hook_panic_fn(instance, args, dest)? { ecx.goto_block(ret)?; // fully evaluated and done Ok(None) } else { diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs index d6d53a740bb..ce16b89d6ea 100644 --- a/src/librustc_mir/interpret/intrinsics.rs +++ b/src/librustc_mir/interpret/intrinsics.rs @@ -354,9 +354,10 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { Ok(true) } - /// "Intercept" a function call because we have something special to do for it. + /// "Intercept" a function call to a panic-related function + /// because we have something special to do for it. /// Returns `true` if an intercept happened. - pub fn hook_fn( + pub fn hook_panic_fn( &mut self, instance: ty::Instance<'tcx>, args: &[OpTy<'tcx, M::PointerTag>], |
