Improvements to 53-bit overflow checking.

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/cpu.h"
@@ skipping 10394 matching lines @@
 }
 
 
 const char* Integer::ToCString() const {
   // Integer is an interface. No instances of Integer should exist.
   UNREACHABLE();
   return "Integer";
 }
 
 
+// Throw FiftyThreeBitOverflow exception.
+static void ThrowFiftyThreeBitOverflow(const Integer& i) {
+  const Array& exc_args = Array::Handle(Array::New(1));
+  exc_args.SetAt(0, i);
+  Exceptions::ThrowByType(Exceptions::kFiftyThreeBitOverflowError, exc_args);
+}
+
+
 RawInteger* Integer::New(const String& str, Heap::Space space) {
   // We are not supposed to have integers represented as two byte strings.
   ASSERT(str.IsOneByteString());
   int64_t value;
   if (!OS::StringToInt64(str.ToCString(), &value)) {
     const Bigint& big = Bigint::Handle(Bigint::New(str, space));
     ASSERT(!BigintOperations::FitsIntoSmi(big));
     ASSERT(!BigintOperations::FitsIntoInt64(big));
+    if (FLAG_throw_on_javascript_int_overflow) {
+      ThrowFiftyThreeBitOverflow(big);
+    }
     return big.raw();
   }
   return Integer::New(value, space);
 }
 
 
+// This is called from LiteralToken::New() in the parser, so we can't
+// raise an exception for 53-bit overflow here. Instead we do it in
+// Parser::CurrentIntegerLiteral(), which is the point in the parser where
+// integer literals escape, so we can call Parser::ErrorMsg().
 RawInteger* Integer::NewCanonical(const String& str) {
   // We are not supposed to have integers represented as two byte strings.
   ASSERT(str.IsOneByteString());
   int64_t value;
   if (!OS::StringToInt64(str.ToCString(), &value)) {
     const Bigint& big = Bigint::Handle(Bigint::NewCanonical(str));
     ASSERT(!BigintOperations::FitsIntoSmi(big));
     ASSERT(!BigintOperations::FitsIntoInt64(big));
     return big.raw();
   }
   if ((value <= Smi::kMaxValue) && (value >= Smi::kMinValue)) {
     return Smi::New(value);
   }
   return Mint::NewCanonical(value);
 }
 
 
-// Throw FiftyThreeBitOverflow exception.
-static void ThrowFiftyThreeBitOverflow(const Integer& i) {
-  const Array& exc_args = Array::Handle(Array::New(1));
-  exc_args.SetAt(0, i);
-  Exceptions::ThrowByType(Exceptions::kFiftyThreeBitOverflowError, exc_args);
-}
-
-
 RawInteger* Integer::New(int64_t value, Heap::Space space) {
   if ((value <= Smi::kMaxValue) && (value >= Smi::kMinValue)) {
     return Smi::New(value);
   }
   if (FLAG_throw_on_javascript_int_overflow && !Utils::IsInt(53, value)) {
     const Integer &i = Integer::Handle(Mint::New(value));
     ThrowFiftyThreeBitOverflow(i);
   }
   return Mint::New(value, space);
 }
@@ skipping 24 matching lines @@
   return 0;
 }
 
 
 int Integer::CompareWith(const Integer& other) const {
   UNIMPLEMENTED();
   return 0;
 }
 
 
-static void CheckFiftyThreeBitOverflow(const Integer &i) {
+// Returns true if the signed Integer requires more than 53 bits.
+bool Integer::CheckFiftyThreeBitOverflow() const {
   // Always overflow if the value doesn't fit into an int64_t.
   int64_t value = 1ULL << 63;
-  if (i.IsSmi()) {
-    value = i.AsInt64Value();
-  } else if (i.IsMint()) {
+  if (IsSmi()) {
+    value = AsInt64Value();
+  } else if (IsMint()) {
     Mint& mint = Mint::Handle();
-    mint ^= i.raw();
+    mint ^= raw();
     value = mint.value();
   } else {
-    ASSERT(i.IsBigint());
+    ASSERT(IsBigint());
     Bigint& big_value = Bigint::Handle();
-    big_value ^= i.raw();
+    big_value ^= raw();
     if (BigintOperations::FitsIntoInt64(big_value)) {
       value = BigintOperations::ToInt64(big_value);
     }
   }
-  if (Utils::IsInt(53, value)) return;
-  ThrowFiftyThreeBitOverflow(i);
+  return !Utils::IsInt(53, value);
 }
 
 
 RawInteger* Integer::AsValidInteger() const {
-  if (FLAG_throw_on_javascript_int_overflow) {
-    CheckFiftyThreeBitOverflow(*this);
+  if (FLAG_throw_on_javascript_int_overflow &&
+      CheckFiftyThreeBitOverflow()) {
+    ThrowFiftyThreeBitOverflow(*this);
   }
   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 2841 matching lines @@
                                     space);
   return reinterpret_cast<RawWeakProperty*>(raw);
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart