Await always waits

runtime/vm/intermediate_language.cc

Index: runtime/vm/intermediate_language.cc
===================================================================
--- runtime/vm/intermediate_language.cc	(revision 40935)
+++ runtime/vm/intermediate_language.cc	(working copy)
@@ -465,7 +465,10 @@
       osr_id_(osr_id),
       entry_count_(0),
       spill_slot_count_(0),
-      fixed_slot_count_(0) {
+      fixed_slot_count_(0),
+      jump_cnt_(0),
+      await_joins_(),
+      await_levels_() {
 }
 
 
@@ -1119,13 +1122,18 @@
 
 
 intptr_t GraphEntryInstr::SuccessorCount() const {
-  return 1 + catch_entries_.length();
+  return 1 + catch_entries_.length() + await_joins_.length();

[Florian Schneider, 2014/10/09 11:29:31]

After looking into the issue I don't think this needed - the await_joins don't
need to be successors of the graph entry since they will be connected later.

[hausner, 2014/10/13 23:41:26]

Done.

 }
 
 
 BlockEntryInstr* GraphEntryInstr::SuccessorAt(intptr_t index) const {
   if (index == 0) return normal_entry_;
-  return catch_entries_[index - 1];
+  index--;

[Florian Schneider, 2014/10/09 11:29:31]

Revert this to the original code as well.

[hausner, 2014/10/13 23:41:26]

Done.

+  if (index < catch_entries_.length()) {
+    return catch_entries_[index];
+  } else {
+    return await_joins_[index - catch_entries_.length()];
+  }
 }