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

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1758 matching lines @@
       value = kMaxInstructionCount;
     }
     raw_ptr()->optimized_call_site_count_ = static_cast<uint16_t>(value);
   }
 
   bool IsOptimizable() const;
   bool IsNativeAutoSetupScope() const;
   void SetIsOptimizable(bool value) const;
   void SetIsNativeAutoSetupScope(bool value) const;
 
-  bool has_finally() const {
-    return HasFinallyBit::decode(raw_ptr()->kind_tag_);
-  }
-  void set_has_finally(bool value) const;
-
   bool is_native() const { return NativeBit::decode(raw_ptr()->kind_tag_); }
   void set_is_native(bool value) const;
 
   bool is_abstract() const { return AbstractBit::decode(raw_ptr()->kind_tag_); }
   void set_is_abstract(bool value) const;
 
   bool IsInlineable() const;
   void set_is_inlinable(bool value) const;
 
   bool is_visible() const {
@@ skipping 176 matching lines @@
     kKindTagBit = 0,
     kKindTagSize = 4,
     kStaticBit = 4,
     kConstBit = 5,
     kAbstractBit = 6,
     kVisibleBit = 7,
     kOptimizableBit = 8,
     kInlinableBit = 9,
     kIntrinsicBit = 10,
     kRecognizedBit = 11,
-    kHasFinallyBit = 12,
-    kNativeBit = 13,
-    kRedirectingBit = 14,
-    kExternalBit = 15,
+    kNativeBit = 12,
+    kRedirectingBit = 13,
+    kExternalBit = 14,
   };
   class KindBits :
     public BitField<RawFunction::Kind, kKindTagBit, kKindTagSize> {};  // NOLINT
   class StaticBit : public BitField<bool, kStaticBit, 1> {};
   class ConstBit : public BitField<bool, kConstBit, 1> {};
   class AbstractBit : public BitField<bool, kAbstractBit, 1> {};
   class VisibleBit : public BitField<bool, kVisibleBit, 1> {};
   class OptimizableBit : public BitField<bool, kOptimizableBit, 1> {};
   class InlinableBit : public BitField<bool, kInlinableBit, 1> {};
   class IntrinsicBit : public BitField<bool, kIntrinsicBit, 1> {};
   class RecognizedBit : public BitField<bool, kRecognizedBit, 1> {};
-  class HasFinallyBit : public BitField<bool, kHasFinallyBit, 1> {};
   class NativeBit : public BitField<bool, kNativeBit, 1> {};
   class ExternalBit : public BitField<bool, kExternalBit, 1> {};
   class RedirectingBit : public BitField<bool, kRedirectingBit, 1> {};
 
   void set_name(const String& value) const;
   void set_kind(RawFunction::Kind value) const;
   void set_is_static(bool value) const;
   void set_is_const(bool value) const;
   void set_is_external(bool value) const;
   void set_parent_function(const Function& value) const;
@@ skipping 4629 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_