Make stackmaps store their actual length.

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 2338 matching lines @@
 
 
 class Stackmap : public Object {
  public:
   static const intptr_t kNoMaximum = -1;
   static const intptr_t kNoMinimum = -1;
 
   bool IsObject(intptr_t index) const {
     return InRange(index) && GetBit(index);
   }
+
+  RawCode* Code() const { return raw_ptr()->code_; }
+  void SetCode(const dart::Code& code) const;
+
+  intptr_t Length() const { return raw_ptr()->length_; }
+
   uword PC() const { return raw_ptr()->pc_; }
   void SetPC(uword value) const { raw_ptr()->pc_ = value; }
 
-  RawCode* GetCode() const { return raw_ptr()->code_; }
-  void SetCode(const Code& code) const;
-
-  // Return the index of the highest stack slot that has an object.
-  intptr_t MaximumBitIndex() const { return raw_ptr()->max_set_bit_index_; }
-
-  // Return the index of the lowest stack slot that has an object.
-  intptr_t MinimumBitIndex() const { return raw_ptr()->min_set_bit_index_; }
-
   static const intptr_t kMaxLengthInBytes = kSmiMax;
 
   static intptr_t InstanceSize() {
     ASSERT(sizeof(RawStackmap) == OFFSET_OF(RawStackmap, data_));
     return 0;
   }
-  static intptr_t InstanceSize(intptr_t length_in_bytes) {
-    ASSERT(length_in_bytes >= 0);
-    ASSERT(length_in_bytes <= kMaxLengthInBytes);
-    return RoundedAllocationSize(sizeof(RawStackmap) + length_in_bytes);
+  static intptr_t InstanceSize(intptr_t length) {
+    ASSERT(length >= 0);
+    // The stackmap payload is in an array of bytes.
+    intptr_t payload_size =
+        Utils::RoundUp(length, kBitsPerByte) / kBitsPerByte;
+    return RoundedAllocationSize(sizeof(RawStackmap) + payload_size);
   }
   static RawStackmap* New(intptr_t pc_offset,
-                          intptr_t length_in_bits,
+                          intptr_t length,
                           BitmapBuilder* bmap);
 
  private:
-  inline intptr_t SizeInBits() const;
+  void SetLength(intptr_t length) const { raw_ptr()->length_ = length; }
 
-  void SetMinBitIndex(intptr_t value) const {
-    raw_ptr()->min_set_bit_index_ = value;
-  }
-  void SetMaxBitIndex(intptr_t value) const {
-    raw_ptr()->max_set_bit_index_ = value;
-  }
-
-  bool InRange(intptr_t index) const { return index < SizeInBits(); }
+  bool InRange(intptr_t index) const { return index < Length(); }
 
   bool GetBit(intptr_t bit_index) const;
   void SetBit(intptr_t bit_index, bool value) const;
 
-  void set_bitmap_size_in_bytes(intptr_t value) const;
-
   HEAP_OBJECT_IMPLEMENTATION(Stackmap, Object);
   friend class BitmapBuilder;
   friend class Class;
 };
 
 
 class ExceptionHandlers : public Object {
  private:
   // Describes the layout of exception handler data.
   enum {
@@ skipping 116 matching lines @@
   }
   intptr_t pointer_offsets_length() const {
     return raw_ptr()->pointer_offsets_length_;
   }
   bool is_optimized() const {
     return (raw_ptr()->is_optimized_ == 1);
   }
   void set_is_optimized(bool value) const {
     raw_ptr()->is_optimized_ = value ? 1 : 0;
   }
-  intptr_t spill_slot_count() const {

[Kevin Millikin (Google), 2012/08/17 09:07:43]

This is no longer used, and it's easy to add back if we need it.

-    return raw_ptr()->spill_slot_count_;
-  }
-  void set_spill_slot_count(intptr_t count) const {
-    raw_ptr()->spill_slot_count_ = count;
-  }
 
   uword EntryPoint() const {
     const Instructions& instr = Instructions::Handle(instructions());
     return instr.EntryPoint();
   }
   intptr_t Size() const {
     const Instructions& instr = Instructions::Handle(instructions());
     return instr.size();
   }
 
@@ skipping 2958 matching lines @@
 intptr_t TokenStream::Length() const {
   return Smi::Value(raw_ptr()->length_);
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 
-intptr_t Stackmap::SizeInBits() const {
-  return (Smi::Value(raw_ptr()->bitmap_size_in_bytes_) * kBitsPerByte);
-}
-
-
 bool String::Equals(const String& str) const {
   if (raw() == str.raw()) {
     return true;  // Both handles point to the same raw instance.
   }
   if (str.IsNull()) {
     return false;
   }
   return Equals(str, 0, str.Length());
 }
 
@@ skipping 12 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_