runtime/vm/flow_graph.cc - Issue 792023002: Don't merge indirect entries.

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 792023002: Don't merge indirect entries. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years 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 20c1fa5fcfb97fd4f32aa4f12d910560fe5d69e8..0db52a3ea2eb6ca4bf745a5ab2546c272b1f915f 100644

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

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

@@ -234,7 +234,9 @@ void FlowGraph::MergeBlocks() {

Instruction* last = block->last_instruction();

BlockEntryInstr* successor = NULL;

- while ((last->SuccessorCount() == 1) &&

+ while ((!last->IsIndirectGoto()) &&

+ (last->SuccessorCount() == 1) &&

+ (!last->SuccessorAt(0)->IsIndirectEntry()) &&

(last->SuccessorAt(0)->PredecessorCount() == 1) &&

(block->try_index() == last->SuccessorAt(0)->try_index())) {

successor = last->SuccessorAt(0);

« no previous file with comments | « no previous file | no next file » | no next file with comments »