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

runtime/vm/intermediate_language_arm.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/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 62 matching lines @@
 }
 
 
 // Attempt optimized compilation at return instruction instead of at the entry.
 // The entry needs to be patchable, no inlined objects are allowed in the area
 // that will be overwritten by the patch instructions: a branch macro sequence.
 void ReturnInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register result = locs()->in(0).reg();
   ASSERT(result == R0);
 #if defined(DEBUG)
-  // TODO(srdjan): Fix for functions with finally clause.
-  // A finally clause may leave a previously pushed return value if it
-  // has its own return instruction. Method that have finally are currently
-  // not optimized.
-  if (!compiler->HasFinally()) {
-    Label stack_ok;
-    __ Comment("Stack Check");
-    const intptr_t fp_sp_dist =
-        (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
-    ASSERT(fp_sp_dist <= 0);
-    __ sub(R2, SP, ShifterOperand(FP));
-    __ CompareImmediate(R2, fp_sp_dist);
-    __ b(&stack_ok, EQ);
-    __ bkpt(0);
-    __ Bind(&stack_ok);
-  }
+  Label stack_ok;
+  __ Comment("Stack Check");
+  const intptr_t fp_sp_dist =
+      (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
+  ASSERT(fp_sp_dist <= 0);
+  __ sub(R2, SP, ShifterOperand(FP));
+  __ CompareImmediate(R2, fp_sp_dist);
+  __ b(&stack_ok, EQ);
+  __ bkpt(0);
+  __ Bind(&stack_ok);
 #endif
   __ LeaveDartFrame();
   __ Ret();
 }
 
 
 static Condition NegateCondition(Condition condition) {
   switch (condition) {
     case EQ: return NE;
     case NE: return EQ;
@@ skipping 4734 matching lines @@
   compiler->GenerateCall(token_pos(),
                          &label,
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM