runtime/vm/flow_graph.cc - Issue 2357343003: Fix lazy deoptimization in the presence of exceptions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/flow_graph.cc

Issue 2357343003: Fix lazy deoptimization in the presence of exceptions (Closed)

Patch Set: Ensure space for patching on ARM/MIPS archs Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: runtime/vm/flow_graph.cc

diff --git a/runtime/vm/flow_graph.cc b/runtime/vm/flow_graph.cc

index 89ed20d543d7e14270e73fe2030b534c03a773fc..f513b304c012f92220fa118ad8641bb91b59e133 100644

--- a/runtime/vm/flow_graph.cc

+++ b/runtime/vm/flow_graph.cc

@@ -2009,7 +2009,9 @@ void FlowGraph::EliminateEnvironments() {

!block_it.Done();

block_it.Advance()) {

BlockEntryInstr* block = block_it.Current();

- block->RemoveEnvironment();

+ if (!block->IsCatchBlockEntry()) {

+ block->RemoveEnvironment();

+ }

for (ForwardInstructionIterator it(block); !it.Done(); it.Advance()) {

Instruction* current = it.Current();

if (!current->CanDeoptimize()) {

« no previous file with comments | « runtime/vm/code_generator.cc ('k') | runtime/vm/flow_graph_allocator.cc » ('j') | no next file with comments »