Use offsetInBytes and not index in the get/set accessors of views.

runtime/lib/typeddata.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 91 matching lines @@
   TYPED_DATA_NEW(name)                                                         \
   EXT_TYPED_DATA_NEW(name)                                                     \
 
 
 CLASS_LIST_TYPED_DATA(TYPED_DATA_NEW_NATIVE)
 
 
 #define TYPED_DATA_GETTER(getter, object)                                      \
 DEFINE_NATIVE_ENTRY(TypedData_##getter, 2) {                                   \
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, instance, arguments->NativeArgAt(0)); \
-  GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1));         \
+  GET_NON_NULL_NATIVE_ARGUMENT(Smi, offsetInBytes, arguments->NativeArgAt(1)); \
   if (instance.IsTypedData()) {                                                \
     const TypedData& array = TypedData::Cast(instance);                        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    return object::New(array.getter(offsetInBytes));                           \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    return object::New(array.getter(offsetInBytes.Value()));                   \
   }                                                                            \
   if (instance.IsExternalTypedData()) {                                        \
     const ExternalTypedData& array = ExternalTypedData::Cast(instance);        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    return object::New(array.getter(offsetInBytes));                           \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    return object::New(array.getter(offsetInBytes.Value()));                   \
   }                                                                            \
   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);                        \
   return object::null();                                                       \
 }                                                                              \
 
 
 #define TYPED_DATA_SETTER(setter, object, get_object_value)                    \
 DEFINE_NATIVE_ENTRY(TypedData_##setter, 3) {                                   \
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, instance, arguments->NativeArgAt(0)); \
-  GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1));         \
+  GET_NON_NULL_NATIVE_ARGUMENT(Smi, offsetInBytes, arguments->NativeArgAt(1)); \
   GET_NON_NULL_NATIVE_ARGUMENT(object, value, arguments->NativeArgAt(2));      \
   if (instance.IsTypedData()) {                                                \
     const TypedData& array = TypedData::Cast(instance);                        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    array.setter(offsetInBytes, value.get_object_value());                     \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    array.setter(offsetInBytes.Value(), value.get_object_value());             \
   } else if (instance.IsExternalTypedData()) {                                 \
     const ExternalTypedData& array = ExternalTypedData::Cast(instance);        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    array.setter(offsetInBytes, value.get_object_value());                     \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    array.setter(offsetInBytes.Value(), value.get_object_value());             \
   } 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);                      \
   }                                                                            \
   return Object::null();                                                       \
 }
 
 
 #define TYPED_DATA_UINT64_GETTER(getter, object)                               \
 DEFINE_NATIVE_ENTRY(TypedData_##getter, 2) {                                   \
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, instance, arguments->NativeArgAt(0)); \
-  GET_NON_NULL_NATIVE_ARGUMENT(Smi, index, arguments->NativeArgAt(1));         \
+  GET_NON_NULL_NATIVE_ARGUMENT(Smi, offsetInBytes, arguments->NativeArgAt(1)); \
   uint64_t value = 0;                                                          \
   if (instance.IsTypedData()) {                                                \
     const TypedData& array = TypedData::Cast(instance);                        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    value = array.getter(offsetInBytes);                                       \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    value = array.getter(offsetInBytes.Value());                               \
   } else if (instance.IsExternalTypedData()) {                                 \
     const ExternalTypedData& array = ExternalTypedData::Cast(instance);        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    value = array.getter(offsetInBytes);                                       \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    value = array.getter(offsetInBytes.Value());                               \
   } 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);                                                  \
   }                                                                            \
   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, index, arguments->NativeArgAt(1));         \
+  GET_NON_NULL_NATIVE_ARGUMENT(Smi, offsetInBytes, arguments->NativeArgAt(1)); \
   GET_NON_NULL_NATIVE_ARGUMENT(object, value, arguments->NativeArgAt(2));      \
   uint64_t object_value;                                                       \
   if (value.IsBigint()) {                                                      \
     const Bigint& bigint = Bigint::Cast(value);                                \
     ASSERT(BigintOperations::FitsIntoUint64(bigint));                          \
     object_value = BigintOperations::AbsToUint64(bigint);                      \
   } else {                                                                     \
     ASSERT(value.IsMint() || value.IsSmi());                                   \
     object_value = value.AsInt64Value();                                       \
   }                                                                            \
   if (instance.IsTypedData()) {                                                \
     const TypedData& array = TypedData::Cast(instance);                        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    array.setter(offsetInBytes, object_value);                                 \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    array.setter(offsetInBytes.Value(), object_value);                         \
   } else if (instance.IsExternalTypedData()) {                                 \
     const ExternalTypedData& array = ExternalTypedData::Cast(instance);        \
-    intptr_t offsetInBytes = index.Value() * array.ElementSizeInBytes();       \
-    ASSERT(RangeCheck(offsetInBytes, array.LengthInBytes()));                  \
-    array.setter(offsetInBytes, object_value);                                 \
+    ASSERT(RangeCheck(offsetInBytes.Value(), array.LengthInBytes()));          \
+    array.setter(offsetInBytes.Value(), object_value);                         \
   } 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);                      \
   }                                                                            \
   return Object::null();                                                       \
 }
 
@@ skipping 13 matching lines @@
 TYPED_DATA_NATIVES(Int16Array, GetInt16, SetInt16, Smi, Value)
 TYPED_DATA_NATIVES(Uint16Array, GetUint16, SetUint16, Smi, Value)
 TYPED_DATA_NATIVES(Int32Array, GetInt32, SetInt32, Integer, AsInt64Value)
 TYPED_DATA_NATIVES(Uint32Array, GetUint32, SetUint32, Integer, AsInt64Value)
 TYPED_DATA_NATIVES(Int64Array, GetInt64, SetInt64, Integer, AsInt64Value)
 TYPED_DATA_UINT64_NATIVES(Uint64Array, GetUint64, SetUint64, Integer)
 TYPED_DATA_NATIVES(Float32Array, GetFloat32, SetFloat32, Double, value)
 TYPED_DATA_NATIVES(Float64Array, GetFloat64, SetFloat64, Double, value)
 
 }  // namespace dart