Adds a flag to the standalone vm to throw an exception on 53-bit integer overflow.

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 32 matching lines @@
 
 DEFINE_FLAG(bool, show_internal_names, false,
     "Show names of internal classes (e.g. \"OneByteString\") in error messages "
     "instead of showing the corresponding interface names (e.g. \"String\")");
 DEFINE_FLAG(bool, trace_disabling_optimized_code, false,
     "Trace disabling optimized code.");
 DEFINE_FLAG(int, huge_method_cutoff_in_tokens, 20000,
     "Huge method cutoff in tokens: Disables optimizations for huge methods.");
 DEFINE_FLAG(int, huge_method_cutoff_in_code_size, 200000,
     "Huge method cutoff in unoptimized code size (in bytes).");
+DEFINE_FLAG(bool, throw_on_javascript_int_overflow, false,
+    "Throw an exception when integer arithmetic exceeds 53 bits.");
 DECLARE_FLAG(bool, trace_compiler);
 DECLARE_FLAG(bool, eliminate_type_checks);
 DECLARE_FLAG(bool, enable_type_checks);
 
 static const char* kGetterPrefix = "get:";
 static const intptr_t kGetterPrefixLength = strlen(kGetterPrefix);
 static const char* kSetterPrefix = "set:";
 static const intptr_t kSetterPrefixLength = strlen(kSetterPrefix);
 
 cpp_vtable Object::handle_vtable_ = 0;
@@ skipping 10368 matching lines @@
     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 Array& exc_args = Array::Handle(Array::New(0));
+  Exceptions::ThrowByType(Exceptions::kFiftyThreeBitOverflowError, exc_args);
+  return;

[srdjan, 2013/05/28 10:57:14]

remove return.

[zra, 2013/05/28 17:06:39]

Done.

+}
+
+
 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)) {
+    ThrowFiftyThreeBitOverflow();
+  }
   return Mint::New(value, space);
 }
 
 
 RawInteger* Integer::NewFromUint64(uint64_t value, Heap::Space space) {
   if (value > static_cast<uint64_t>(Mint::kMaxValue)) {
+    if (FLAG_throw_on_javascript_int_overflow) {
+      ThrowFiftyThreeBitOverflow();
+    }
     return BigintOperations::NewFromUint64(value);
   } else {
     return Integer::New(value);
   }
 }
 
 
 double Integer::AsDoubleValue() const {
   UNIMPLEMENTED();
   return 0.0;
 }
 
 
 int64_t Integer::AsInt64Value() const {
   UNIMPLEMENTED();
   return 0;
 }
 
 
 int Integer::CompareWith(const Integer& other) const {
   UNIMPLEMENTED();
   return 0;
 }
 
 
+static void CheckFiftyThreeBitOverflow(const Integer &i) {

[srdjan, 2013/05/28 10:57:14]

Optional: The code would be simpler if you have ThrowFifty... only once and use
if (Util::IsInt (...)) return;

[zra, 2013/05/28 17:06:39]

I gave this a shot. Please let me know if it looks like it could be simplified
further.

+  if (i.IsSmi()) return;
+  if (i.IsMint()) {
+    Mint& mint = Mint::Handle();
+    mint ^= i.raw();
+    if (!Utils::IsInt(53, mint.value())) {
+      ThrowFiftyThreeBitOverflow();
+    }
+    return;
+  }
+  ASSERT(i.IsBigint());
+  Bigint& big_value = Bigint::Handle();
+  big_value ^= i.raw();
+  if (BigintOperations::FitsIntoInt64(big_value)) {
+    if (!Utils::IsInt(53, BigintOperations::ToInt64(big_value))) {
+      ThrowFiftyThreeBitOverflow();
+    }
+  } else {
+    ThrowFiftyThreeBitOverflow();
+  }
+}
+
+
 RawInteger* Integer::AsValidInteger() const {
+  if (FLAG_throw_on_javascript_int_overflow) {
+    CheckFiftyThreeBitOverflow(*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 2849 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart