Cleanups and added more checks for valid Integer allocation (must be Smi, Mint or Bigint for their …

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 9265 matching lines @@
   return 0;
 }
 
 
 int Integer::CompareWith(const Integer& other) const {
   UNIMPLEMENTED();
   return 0;
 }
 
 
-RawInteger* Integer::AsInteger() const {
+RawInteger* Integer::AsValidInteger() const {
   if (IsSmi()) return raw();
   if (IsMint()) {
     Mint& mint = Mint::Handle();
     mint ^= raw();
     if (Smi::IsValid64(mint.value())) {
       return Smi::New(mint.value());
     } else {
       return raw();
     }
   }
@@ skipping 98 matching lines @@
         default:
           UNIMPLEMENTED();
         }
       }
     }
   }
   const Bigint& left_big = Bigint::Handle(AsBigint());
   const Bigint& right_big = Bigint::Handle(other.AsBigint());
   const Bigint& result =
       Bigint::Handle(left_big.ArithmeticOp(operation, right_big));
-  return Integer::Handle(result.AsInteger()).raw();
+  return Integer::Handle(result.AsValidInteger()).raw();
 }
 
 
 static bool Are64bitOperands(const Integer& op1, const Integer& op2) {
   return !op1.IsBigint() && !op2.IsBigint();
 }
 
 
 RawInteger* Integer::BitOp(Token::Kind kind, const Integer& other) const {
   if (IsSmi() && other.IsSmi()) {
@@ skipping 450 matching lines @@
   for (intptr_t i = 0; i < len; i++) {
     if (this->GetChunkAt(i) != other_bgi.GetChunkAt(i)) {
       return false;
     }
   }
   return true;
 }
 
 
 RawBigint* Bigint::New(const String& str, Heap::Space space) {
-  return BigintOperations::NewFromCString(str.ToCString(), space);
-}
-
-
-RawBigint* Bigint::New(int64_t value, Heap::Space space) {
-  return BigintOperations::NewFromInt64(value, space);
+  const Bigint& result = Bigint::Handle(
+      BigintOperations::NewFromCString(str.ToCString(), space));
+  ASSERT(!BigintOperations::FitsIntoMint(result));
+  return result.raw();
 }
 
 
 double Bigint::AsDoubleValue() const {
   return Double::Handle(BigintOperations::ToDouble(*this)).value();
 }
 
 
 int64_t Bigint::AsInt64Value() const {
   if (!BigintOperations::FitsIntoMint(*this)) {
@@ skipping 2304 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart