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

runtime/vm/intermediate_language_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/dart_entry.h"
@@ skipping 60 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 instruction: a jump).
 void ReturnInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register result = locs()->in(0).reg();
   ASSERT(result == RAX);
 #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()) {
-    __ Comment("Stack Check");
-    Label done;
-    const intptr_t fp_sp_dist =
-        (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
-    ASSERT(fp_sp_dist <= 0);
-    __ movq(RDI, RSP);
-    __ subq(RDI, RBP);
-    __ CompareImmediate(RDI, Immediate(fp_sp_dist), PP);
-    __ j(EQUAL, &done, Assembler::kNearJump);
-    __ int3();
-    __ Bind(&done);
-  }
+  __ Comment("Stack Check");
+  Label done;
+  const intptr_t fp_sp_dist =
+      (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
+  ASSERT(fp_sp_dist <= 0);
+  __ movq(RDI, RSP);
+  __ subq(RDI, RBP);
+  __ CompareImmediate(RDI, Immediate(fp_sp_dist), PP);
+  __ j(EQUAL, &done, Assembler::kNearJump);
+  __ int3();
+  __ Bind(&done);
 #endif
   __ LeaveDartFrame();
   __ ret();
 }
 
 
 static Condition NegateCondition(Condition condition) {
   switch (condition) {
     case EQUAL:         return NOT_EQUAL;
     case NOT_EQUAL:     return EQUAL;
@@ skipping 4851 matching lines @@
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64