Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(749)

Unified Diff: runtime/vm/flow_graph_allocator.cc

Issue 539153002: Port and integrate the irregexp engine from V8 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated to current version Created 6 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:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/flow_graph_allocator.cc
diff --git a/runtime/vm/flow_graph_allocator.cc b/runtime/vm/flow_graph_allocator.cc
index 03f8f2fb255f2d54c8433e31cf722270691804ff..78ab97f4c522189315b1b90986b19f65b4f105d9 100644
--- a/runtime/vm/flow_graph_allocator.cc
+++ b/runtime/vm/flow_graph_allocator.cc
@@ -218,7 +218,7 @@ void SSALivenessAnalysis::ComputeInitialSets() {
}
// Handle phis.
- if (block->IsJoinEntry()) {
+ if (block->IsJoinEntry() || block->IsIndirectEntry()) {
JoinEntryInstr* join = block->AsJoinEntry();
for (PhiIterator it(join); !it.Done(); it.Advance()) {
// TODO(johnmccutchan): Fix handling of PhiInstr with PairLocation.
@@ -575,7 +575,7 @@ void FlowGraphAllocator::BuildLiveRanges() {
}
}
- if (block->IsJoinEntry()) {
+ if (block->IsJoinEntry() || block->IsIndirectEntry()) {
ConnectIncomingPhiMoves(block->AsJoinEntry());
} else if (block->IsCatchBlockEntry()) {
// Process initial definitions.
@@ -2847,7 +2847,7 @@ void FlowGraphAllocator::CollectRepresentations() {
}
}
// Phis.
- if (block->IsJoinEntry()) {
+ if (block->IsJoinEntry() || block->IsIndirectEntry()) {
JoinEntryInstr* join = block->AsJoinEntry();
for (PhiIterator it(join); !it.Done(); it.Advance()) {
// TODO(johnmccutchan): Fix handling of PhiInstr with PairLocation.

Powered by Google App Engine
This is Rietveld 408576698