Await always waits

runtime/vm/intermediate_language.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
@@ skipping 447 matching lines @@
                                  TargetEntryInstr* normal_entry,
                                  intptr_t osr_id)
     : BlockEntryInstr(0, CatchClauseNode::kInvalidTryIndex),
       parsed_function_(parsed_function),
       normal_entry_(normal_entry),
       catch_entries_(),
       initial_definitions_(),
       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_() {
 }
 
 
 ConstantInstr* GraphEntryInstr::constant_null() {
   ASSERT(initial_definitions_.length() > 0);
   for (intptr_t i = 0; i < initial_definitions_.length(); ++i) {
     ConstantInstr* defn = initial_definitions_[i]->AsConstant();
     if (defn != NULL && defn->value().IsNull()) return defn;
   }
   UNREACHABLE();
@@ skipping 633 matching lines @@
 
 BlockEntryInstr* Instruction::SuccessorAt(intptr_t index) const {
   // Called only if index is in range.  Only control-transfer instructions
   // can have non-zero successor counts and they override this function.
   UNREACHABLE();
   return NULL;
 }
 
 
 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()];
+  }
 }
 
 
 intptr_t BranchInstr::SuccessorCount() const {
   return 2;
 }
 
 
 BlockEntryInstr* BranchInstr::SuccessorAt(intptr_t index) const {
   if (index == 0) return true_successor_;
@@ skipping 2196 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart