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

runtime/lib/typed_data.cc

 // Copyright (c) 2013, 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/bootstrap_natives.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 
 namespace dart {
 
+DECLARE_FLAG(bool, throw_on_53bit_overflow);
+
 // TypedData.
 
 // Checks to see if offset_in_bytes is in the range.
 static bool RangeCheck(intptr_t offset_in_bytes, intptr_t length_in_bytes) {
   return ((offset_in_bytes >= 0) &&
           (length_in_bytes > 0) &&
           (offset_in_bytes < length_in_bytes));
 }
 
 
@@ skipping 228 matching lines @@
     const Array& args = Array::Handle(Array::New(1));                          \
     args.SetAt(0, error);                                                      \
     Exceptions::ThrowByType(Exceptions::kArgument, args);                      \
   }                                                                            \
   Integer& result = Integer::Handle();                                         \
   if (value > static_cast<uint64_t>(Mint::kMaxValue)) {                        \
     result = BigintOperations::NewFromUint64(value);                           \
   } else {                                                                     \
     result = Integer::New(value);                                              \
   }                                                                            \
+  if (FLAG_throw_on_53bit_overflow && !result.FitsIn53Bits()) {                \
+    const Array& exc_args = Array::Handle(Array::New(1));                      \
+    exc_args.SetAt(0, Object::Handle(String::New("TypedData_getter")));        \
+    Exceptions::ThrowByType(Exceptions::kFiftyThreeBitOverflowError, exc_args);\
+  }                                                                            \
   return result.raw();                                                         \
 }                                                                              \
 
 
 // TODO(asiva): Consider truncating the bigint value if it does not fit into
 // a uint64_t value (see ASSERT(BigintOperations::FitsIntoUint64(bigint))).
 #define TYPED_DATA_UINT64_SETTER(setter, object)                               \
 DEFINE_NATIVE_ENTRY(TypedData_##setter, 3) {                                   \
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, instance, arguments->NativeArgAt(0)); \
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, offsetInBytes, arguments->NativeArgAt(1)); \
@@ skipping 103 matching lines @@
 
 DEFINE_NATIVE_ENTRY(ByteData_ToEndianInt64, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, host_value, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Bool, little_endian, arguments->NativeArgAt(1));
   int64_t value = host_value.AsInt64Value();
   if (little_endian.value()) {
     value = Utils::HostToLittleEndian64(value);
   } else {
     value = Utils::HostToBigEndian64(value);
   }
-  return Integer::New(value);
+  const Integer& i = Integer::Handle(Integer::New(value));
+  if (FLAG_throw_on_53bit_overflow && !i.FitsIn53Bits()) {
+    const Array& exc_args = Array::Handle(Array::New(1));
+    exc_args.SetAt(0, Object::Handle(String::New("ByteData_ToEndianInt64")));
+    Exceptions::ThrowByType(Exceptions::kFiftyThreeBitOverflowError, exc_args);
+  }
+  return i.AsValidInteger();

[siva, 2013/05/23 01:28:22]

Ditto comment about the AsValidInteger.

[zra, 2013/05/23 15:59:07]

Done.

 }
 
 
 DEFINE_NATIVE_ENTRY(ByteData_ToEndianUint64, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, host_value, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Bool, little_endian, arguments->NativeArgAt(1));
   uint64_t value;
   if (host_value.IsBigint()) {
     const Bigint& bigint = Bigint::Cast(host_value);
     ASSERT(BigintOperations::FitsIntoUint64(bigint));
     value = BigintOperations::AbsToUint64(bigint);
   } else {
     ASSERT(host_value.IsMint() || host_value.IsSmi());
     value = host_value.AsInt64Value();
   }
   if (little_endian.value()) {
     value = Utils::HostToLittleEndian64(value);
   } else {
     value = Utils::HostToBigEndian64(value);
   }
   if (value > static_cast<uint64_t>(Mint::kMaxValue)) {

[siva, 2013/05/23 01:28:22]

What about throwing an exception here?

[zra, 2013/05/23 15:59:07]

Yes, I've added a throw here, too.

     return BigintOperations::NewFromUint64(value);
   }
-  return Integer::New(value);
+  const Integer& i = Integer::Handle(Integer::New(value));
+  if (FLAG_throw_on_53bit_overflow && !i.FitsIn53Bits()) {
+    const Array& exc_args = Array::Handle(Array::New(1));
+    exc_args.SetAt(0, Object::Handle(String::New("ByteData_ToEndianUint64")));
+    Exceptions::ThrowByType(Exceptions::kFiftyThreeBitOverflowError, exc_args);
+  }
+  return i.AsValidInteger();

[siva, 2013/05/23 01:28:22]

Ditto comment about AsValidInteger

[zra, 2013/05/23 15:59:07]

Done.

 }
 
 
 DEFINE_NATIVE_ENTRY(ByteData_ToEndianFloat32, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Double, host_value, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Bool, little_endian, arguments->NativeArgAt(1));
   float value = host_value.value();
   if (little_endian.value()) {
     value = bit_cast<float>(
         Utils::HostToLittleEndian32(bit_cast<uint32_t>(value)));
@@ skipping 13 matching lines @@
     value = bit_cast<double>(
         Utils::HostToLittleEndian64(bit_cast<uint64_t>(value)));
   } else {
     value = bit_cast<double>(
         Utils::HostToBigEndian64(bit_cast<uint64_t>(value)));
   }
   return Double::New(value);
 }
 
 }  // namespace dart