summaryrefslogtreecommitdiffstats
path: root/src/librustc_mir/interpret/step.rs
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-25 01:26:43 +0800
committerGitHub <noreply@github.com>2018-03-25 01:26:43 +0800
commit924f24a6c46ae4e586abd6b79a026119855595da (patch)
tree0904ce42e2e1fdfc8c3382fcfd3cad084cd6b786 /src/librustc_mir/interpret/step.rs
parentRollup merge of #49273 - michaelwoerister:fix-extern-proc-macro-defkey, r=eddyb (diff)
parentSimplify local accessors (diff)
downloadgrust-924f24a6c46ae4e586abd6b79a026119855595da.tar.gz
grust-924f24a6c46ae4e586abd6b79a026119855595da.tar.bz2
grust-924f24a6c46ae4e586abd6b79a026119855595da.tar.xz
Rollup merge of #49274 - oli-obk:slow_miri, r=michaelwoerister,eddyb
Remove slow HashSet during miri stack frame creation fixes #49237 probably has a major impact on #48846 r? @michaelwoerister cc @eddyb I know you kept telling me to use vectors instead of hash containers... Now I know why.
Diffstat (limited to 'src/librustc_mir/interpret/step.rs')
-rw-r--r--src/librustc_mir/interpret/step.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_mir/interpret/step.rs b/src/librustc_mir/interpret/step.rs
index f1d58ff5e8..a22572ec68 100644
--- a/src/librustc_mir/interpret/step.rs
+++ b/src/librustc_mir/interpret/step.rs
@@ -69,13 +69,13 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> {
69 69
70 // Mark locals as alive 70 // Mark locals as alive
71 StorageLive(local) => { 71 StorageLive(local) => {
72 let old_val = self.frame_mut().storage_live(local)?; 72 let old_val = self.frame_mut().storage_live(local);
73 self.deallocate_local(old_val)?; 73 self.deallocate_local(old_val)?;
74 } 74 }
75 75
76 // Mark locals as dead 76 // Mark locals as dead
77 StorageDead(local) => { 77 StorageDead(local) => {
78 let old_val = self.frame_mut().storage_dead(local)?; 78 let old_val = self.frame_mut().storage_dead(local);
79 self.deallocate_local(old_val)?; 79 self.deallocate_local(old_val)?;
80 } 80 }
81 81