Fix stack height assertion code and free up a bit in the Function tag bits.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, 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/flow_graph_builder.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/class_finalizer.h"
@@ skipping 572 matching lines @@
 }
 
 
 void EffectGraphVisitor::Goto(JoinEntryInstr* join) {
   ASSERT(is_open());
   if (is_empty()) {
     entry_ = new GotoInstr(join);
   } else {
     exit()->Goto(join);
   }
-  exit_ = NULL;
+  CloseFragment();
 }
 
 
 // Appends a graph fragment to a block entry instruction.  Returns the entry
 // instruction if the fragment was empty or else the exit of the fragment if
 // it was non-empty (so NULL if the fragment is closed).
 //
 // Note that the fragment is no longer a valid fragment after calling this
 // function -- the fragment is closed at its entry because the entry has a
 // predecessor in the graph.
@@ skipping 338 matching lines @@
   if (owner()->IsInlining()) owner()->Bailout(reason);
 }
 
 
 // <Statement> ::= Return { value:                <Expression>
 //                          inlined_finally_list: <InlinedFinally>* }
 void EffectGraphVisitor::VisitReturnNode(ReturnNode* node) {
   ValueGraphVisitor for_value(owner());
   node->value()->Visit(&for_value);
   Append(for_value);
+  Value* return_value = for_value.value();
 
-  for (intptr_t i = 0; i < node->inlined_finally_list_length(); i++) {
-    InlineBailout("EffectGraphVisitor::VisitReturnNode (exception)");
-    EffectGraphVisitor for_effect(owner());
-    node->InlinedFinallyNodeAt(i)->Visit(&for_effect);
-    Append(for_effect);
-    if (!is_open()) {
-      owner()->DeallocateTemps(owner()->temp_count());
-      return;
+  if (node->inlined_finally_list_length() > 0) {
+    LocalVariable* temp = node->saved_return_value_var();
+    Do(BuildStoreLocal(*temp, return_value, kResultNotNeeded));
+    for (intptr_t i = 0; i < node->inlined_finally_list_length(); i++) {
+      InlineBailout("EffectGraphVisitor::VisitReturnNode (exception)");
+      EffectGraphVisitor for_effect(owner());
+      node->InlinedFinallyNodeAt(i)->Visit(&for_effect);
+      Append(for_effect);
+      if (!is_open()) {
+        return;
+      }
     }
+    return_value = Bind(BuildLoadLocal(*temp));
   }
 
   // Call to stub that checks whether the debugger is in single
   // step mode. This call must happen before the contexts are
   // unchained so that captured variables can be inspected.
   // No debugger check is done in native functions or for return
   // statements for which there is no associated source position.
   const Function& function = owner()->parsed_function()->function();
   if ((node->token_pos() != Scanner::kNoSourcePos) &&
       !function.is_native()) {
     AddInstruction(new DebugStepCheckInstr(node->token_pos(),
                                            PcDescriptors::kReturn));
   }
 
-  Value* return_value = for_value.value();
   if (FLAG_enable_type_checks) {
     const bool is_implicit_dynamic_getter =
         (!function.is_static() &&
         ((function.kind() == RawFunction::kImplicitGetter) ||
          (function.kind() == RawFunction::kImplicitStaticFinalGetter)));
     // Implicit getters do not need a type check at return, unless they compute
     // the initial value of a static field.
     // The body of a constructor cannot modify the type of the
     // constructed instance, which is passed in as an implicit parameter.
     // However, factories may create an instance of the wrong type.
@@ skipping 3064 matching lines @@
                                   LanguageError::kError,
                                   Heap::kNew,
                                   "FlowGraphBuilder Bailout: %s %s",
                                   String::Handle(function.name()).ToCString(),
                                   reason));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart