Fix issue 5275: The VM must always generate the most compact form of an integer (Smi, Mint or Bigin…

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"
@@ skipping 240 matching lines @@
   } else {                                                                     \
     const String& error = String::Handle(String::NewFormatted(                 \
         "Expected a TypedData object but found %s", instance.ToCString()));    \
     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 if (value > static_cast<uint64_t>(Smi::kMaxValue)) {                  \
-    result = Mint::New(value);                                                 \
   } else {                                                                     \
-    result = Smi::New(value);                                                  \
+    result = Integer::New(value);                                              \
   }                                                                            \
   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)); \
@@ skipping 127 matching lines @@
     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)) {
     return BigintOperations::NewFromUint64(value);
-  } else if (value > static_cast<uint64_t>(Smi::kMaxValue)) {
-    return Mint::New(value);
   }
-  return Smi::New(value);
+  return Integer::New(value);
 }
 
 
 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