Await always waits

runtime/vm/flow_graph_builder.h

Index: runtime/vm/flow_graph_builder.h
===================================================================
--- runtime/vm/flow_graph_builder.h	(revision 40935)
+++ runtime/vm/flow_graph_builder.h	(working copy)
@@ -178,12 +178,15 @@
   void set_catch_try_index(intptr_t value) { catch_try_index_ = value; }
   intptr_t catch_try_index() const { return catch_try_index_; }
 
-  intptr_t next_await_counter() { return jump_cnt_++; }
-
-  ZoneGrowableArray<intptr_t>* await_levels() const { return await_levels_; }
-  ZoneGrowableArray<JoinEntryInstr*>* await_joins() const {
-    return await_joins_;
+  intptr_t next_await_counter() {
+    return graph_entry_->next_await_counter();
   }
+  ZoneGrowableArray<intptr_t>& await_levels() const {
+    return graph_entry_->await_levels();
+  }
+  ZoneGrowableArray<JoinEntryInstr*>& await_joins() const {
+    return graph_entry_->await_joins();
+  }
 
   void AddCatchEntry(CatchBlockEntryInstr* entry);
 
@@ -268,10 +271,6 @@
   // for OSR.
   const intptr_t osr_id_;
 
-  intptr_t jump_cnt_;
-  ZoneGrowableArray<JoinEntryInstr*>* await_joins_;
-  ZoneGrowableArray<intptr_t>* await_levels_;
-
   DISALLOW_IMPLICIT_CONSTRUCTORS(FlowGraphBuilder);
 };