Option to truncate integers to 64 bits, part 2

runtime/vm/dart_api_impl.cc

Index: runtime/vm/dart_api_impl.cc
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index f4caf77da76ee1cbf1244d70bdf491e39dac9ab3..3b16d5bc8384918194ae176bd9e9fced2de84e10 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -269,6 +269,7 @@ static bool GetNativeUnsignedIntegerArgument(NativeArguments* arguments,
   obj = arguments->NativeArgAt(arg_index);
   intptr_t cid = obj.GetClassId();
   if (cid == kBigintCid) {
+    ASSERT(!Bigint::IsDisabled());
     const Bigint& bigint = Bigint::Cast(obj);
     if (bigint.FitsIntoUint64()) {
       *value = bigint.AsUint64Value();
@@ -2012,6 +2013,7 @@ DART_EXPORT Dart_Handle Dart_IntegerFitsIntoUint64(Dart_Handle integer,
   if (int_obj.IsMint()) {
     *fits = !int_obj.IsNegative();
   } else {
+    ASSERT(!Bigint::IsDisabled());
     *fits = Bigint::Cast(int_obj).FitsIntoUint64();
   }
   return Api::Success();
@@ -2037,7 +2039,12 @@ DART_EXPORT Dart_Handle Dart_NewIntegerFromUint64(uint64_t value) {
   DARTSCOPE(Thread::Current());
   CHECK_CALLBACK_STATE(T);
   API_TIMELINE_DURATION;
-  return Api::NewHandle(T, Integer::NewFromUint64(value));
+  RawInteger* integer = Integer::NewFromUint64(value);
+  if (integer == Integer::null()) {
+    return Api::NewError("%s: Cannot create Dart integer from value %" Pu64,
+                         CURRENT_FUNC, value);
+  }
+  return Api::NewHandle(T, integer);
 }
 
 DART_EXPORT Dart_Handle Dart_NewIntegerFromHexCString(const char* str) {
@@ -2045,7 +2052,12 @@ DART_EXPORT Dart_Handle Dart_NewIntegerFromHexCString(const char* str) {
   CHECK_CALLBACK_STATE(T);
   API_TIMELINE_DURATION;
   const String& str_obj = String::Handle(Z, String::New(str));
-  return Api::NewHandle(T, Integer::New(str_obj));
+  RawInteger* integer = Integer::New(str_obj);
+  if (integer == Integer::null()) {
+    return Api::NewError("%s: Cannot create Dart integer from string %s",
+                         CURRENT_FUNC, str);
+  }
+  return Api::NewHandle(T, integer);
 }
 
 DART_EXPORT Dart_Handle Dart_IntegerToInt64(Dart_Handle integer,
@@ -2069,6 +2081,7 @@ DART_EXPORT Dart_Handle Dart_IntegerToInt64(Dart_Handle integer,
     *value = int_obj.AsInt64Value();
     return Api::Success();
   } else {
+    ASSERT(!Bigint::IsDisabled());
     const Bigint& bigint = Bigint::Cast(int_obj);
     if (bigint.FitsIntoInt64()) {
       *value = bigint.AsInt64Value();
@@ -2106,6 +2119,7 @@ DART_EXPORT Dart_Handle Dart_IntegerToUint64(Dart_Handle integer,
       return Api::Success();
     }
   } else {
+    ASSERT(!Bigint::IsDisabled());
     const Bigint& bigint = Bigint::Cast(int_obj);
     if (bigint.FitsIntoUint64()) {
       *value = bigint.AsUint64Value();
@@ -3085,6 +3099,8 @@ static Dart_TypedData_Type GetType(intptr_t class_id) {
     case kTypedDataUint64ArrayCid:
     case kTypedDataUint64ArrayViewCid:
     case kExternalTypedDataUint64ArrayCid:
+      // TODO(alexmarkov): Figure out if Uint64 should be rejected in

[zra, 2017/07/14 17:36:30]

I think we'll probably need to keep these. When we pull them out of the array,
we can either complain or make a BigInt depending on whether their enabled.

[alexmarkov, 2017/07/14 18:23:45]

Done.

+      // --limit-ints-to-64-bits mode.
       type = Dart_TypedData_kUint64;
       break;
     case kTypedDataFloat32ArrayCid:
@@ -3253,6 +3269,8 @@ DART_EXPORT Dart_Handle Dart_NewTypedData(Dart_TypedData_Type type,
     case Dart_TypedData_kInt64:
       return NewTypedData(T, kTypedDataInt64ArrayCid, length);
     case Dart_TypedData_kUint64:
+      // TODO(alexmarkov): Figure out if Uint64 should be rejected in

[zra, 2017/07/14 17:36:30]

ditto

[alexmarkov, 2017/07/14 18:23:45]

Done.

+      // --limit-ints-to-64-bits mode.
       return NewTypedData(T, kTypedDataUint64ArrayCid, length);
     case Dart_TypedData_kFloat32:
       return NewTypedData(T, kTypedDataFloat32ArrayCid, length);
@@ -3304,6 +3322,8 @@ DART_EXPORT Dart_Handle Dart_NewExternalTypedData(Dart_TypedData_Type type,
       return NewExternalTypedData(T, kExternalTypedDataInt64ArrayCid, data,
                                   length);
     case Dart_TypedData_kUint64:
+      // TODO(alexmarkov): Figure out if Uint64 should be rejected in
+      // --limit-ints-to-64-bits mode.
       return NewExternalTypedData(T, kExternalTypedDataUint64ArrayCid, data,
                                   length);
     case Dart_TypedData_kFloat32: