Fix issue 5275: The VM must always generate the most compact form of an integer (Smi, Mint or Bigin…

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 3913 matching lines @@
   static RawInteger* New(int64_t value, Heap::Space space = Heap::kNew);
 
   virtual double AsDoubleValue() const;
   virtual int64_t AsInt64Value() const;
 
   // Returns 0, -1 or 1.
   virtual int CompareWith(const Integer& other) const;
 
   // Return the most compact presentation of an integer.
   RawInteger* AsValidInteger() const;
-  // Return an integer in the form of a RawBigint.
-  RawBigint* AsBigint() const;
 
   RawInteger* ArithmeticOp(Token::Kind operation, const Integer& other) const;
   RawInteger* BitOp(Token::Kind operation, const Integer& other) const;
 
+ private:
+  // Return an integer in the form of a RawBigint.
+  RawBigint* AsBigint() const;
+
   OBJECT_IMPLEMENTATION(Integer, Number);
   friend class Class;
 };
 
 
 class Smi : public Integer {
  public:
   static const intptr_t kBits = kSmiBits;
   static const intptr_t kMaxValue = kSmiMax;
   static const intptr_t kMinValue =  kSmiMin;
@@ skipping 89 matching lines @@
     return value() < 0;
   }
 
   virtual bool Equals(const Instance& other) const;
 
   virtual double AsDoubleValue() const;
   virtual int64_t AsInt64Value() const;
 
   virtual int CompareWith(const Integer& other) const;
 
-  static RawMint* New(int64_t value, Heap::Space space = Heap::kNew);
-  static RawMint* NewCanonical(int64_t value);
-
   static intptr_t InstanceSize() {
     return RoundedAllocationSize(sizeof(RawMint));
   }
 
+ protected:
+  // Only Integer::NewXXX is allowed to call Mint::NewXXX directly.
+  friend class Integer;
+
+  static RawMint* New(int64_t value, Heap::Space space = Heap::kNew);
+
+  static RawMint* NewCanonical(int64_t value);
+
  private:
   void set_value(int64_t value) const;
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(Mint, Integer);
   friend class Class;
 };
 
 
 class Bigint : public Integer {
  private:
@@ skipping 15 matching lines @@
   static const intptr_t kBytesPerElement = kChunkSize;
   static const intptr_t kMaxElements = kSmiMax / kBytesPerElement;
 
   static intptr_t InstanceSize() { return 0; }
 
   static intptr_t InstanceSize(intptr_t len) {
     ASSERT(0 <= len && len <= kMaxElements);
     return RoundedAllocationSize(sizeof(RawBigint) + (len * kBytesPerElement));
   }
 
+  RawBigint* ArithmeticOp(Token::Kind operation, const Bigint& other) const;
+
+ protected:
+  // Only Integer::NewXXX is allowed to call Bigint::NewXXX directly.
+  friend class Integer;
+
   static RawBigint* New(const String& str, Heap::Space space = Heap::kNew);
 
   // Returns a canonical Bigint object allocated in the old gen space.
   static RawBigint* NewCanonical(const String& str);
 
-  RawBigint* ArithmeticOp(Token::Kind operation, const Bigint& other) const;
-
  private:
   Chunk GetChunkAt(intptr_t i) const {
     return *ChunkAddr(i);
   }
 
   void SetChunkAt(intptr_t i, Chunk newValue) const {
     *ChunkAddr(i) = newValue;
   }
 
   // Returns the number of chunks in use.
@@ skipping 1645 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_