[simdjs] Implement error raising semantics as per spec for integers.

src/runtime/runtime-simd.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/runtime/runtime-utils.h"
 
 #include "src/arguments.h"
 #include "src/base/macros.h"
 #include "src/conversions.h"
 #include "src/factory.h"
@@ skipping 150 matching lines @@
   HandleScope scope(isolate);
   DCHECK(args.length() == 1);
   return isolate->heap()->ToBoolean(args[0]->IsSimd128Value());
 }
 
 
 //-------------------------------------------------------------------
 
 // Utility macros.
 
-#define CONVERT_SIMD_LANE_ARG_CHECKED(name, index, lanes) \
-  CONVERT_INT32_ARG_CHECKED(name, index);                 \
-  RUNTIME_ASSERT(name >= 0 && name < lanes);
+#define CONVERT_SIMD_LANE_ARG_CHECKED(name, index, lanes)               \
+  Handle<Object> name_object;                                           \
+  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(                                   \
+      isolate, name_object, Object::ToNumber(args.at<Object>(index)));  \
+  if (!name_object->IsNumber()) {                                       \

[bbudge, 2016/05/11 18:33:16]

Can't you assume name_object is a number at this point?

[gdeepti, 2016/05/17 14:59:41]

Removed index coercion here as the polyfill does not support it yet. Gated on
https://github.com/tc39/ecmascript_simd/pull/335 getting merged into the
polyfill + polyfill being updated or using Test262 to run simd tests. Fixed for
loads/stores. 

+    THROW_NEW_ERROR_RETURN_FAILURE(                                     \
+        isolate, NewTypeError(MessageTemplate::kInvalidSimdOperation)); \
+  }                                                                     \
+  uint32_t name;                                                        \
+  name = name_object->Number();                                         \
+  if (name < 0 || name >= lanes) {                                      \
+    THROW_NEW_ERROR_RETURN_FAILURE(                                     \
+        isolate, NewRangeError(MessageTemplate::kInvalidSimdIndex));    \
+  }
 
 #define CONVERT_SIMD_ARG_HANDLE_THROW(Type, name, index)                \
   Handle<Type> name;                                                    \
   if (args[index]->Is##Type()) {                                        \
     name = args.at<Type>(index);                                        \
   } else {                                                              \
     THROW_NEW_ERROR_RETURN_FAILURE(                                     \
         isolate, NewTypeError(MessageTemplate::kInvalidSimdOperation)); \
   }
 
@@ skipping 26 matching lines @@
   bool lanes[kLaneCount];                                                 \
   for (int i = 0; i < kLaneCount; i++) {                                  \
     lanes[i] = a->get_lane(i) op b->get_lane(i);                          \
   }                                                                       \
   Handle<bool_type> result = isolate->factory()->New##bool_type(lanes);
 
 //-------------------------------------------------------------------
 
 // Common functions.
 
-#define GET_NUMERIC_ARG(lane_type, name, index) \
-  CONVERT_NUMBER_ARG_HANDLE_CHECKED(a, index);  \
+#define GET_NUMERIC_ARG(lane_type, name, index)              \
+  Handle<Object> a;                                          \
+  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(                        \
+      isolate, a, Object::ToNumber(args.at<Object>(index))); \
   name = ConvertNumber<lane_type>(a->Number());
 
 #define GET_BOOLEAN_ARG(lane_type, name, index) \
   name = args[index]->BooleanValue();
 
 #define SIMD_ALL_TYPES(FUNCTION)                              \
   FUNCTION(Float32x4, float, 4, NewNumber, GET_NUMERIC_ARG)   \
   FUNCTION(Int32x4, int32_t, 4, NewNumber, GET_NUMERIC_ARG)   \
   FUNCTION(Uint32x4, uint32_t, 4, NewNumber, GET_NUMERIC_ARG) \
   FUNCTION(Bool32x4, bool, 4, ToBoolean, GET_BOOLEAN_ARG)     \
@@ skipping 624 matching lines @@
 
 //-------------------------------------------------------------------
 
 // Load and Store functions.
 
 #define SIMD_LOADN_STOREN_TYPES(FUNCTION) \
   FUNCTION(Float32x4, float, 4)           \
   FUNCTION(Int32x4, int32_t, 4)           \
   FUNCTION(Uint32x4, uint32_t, 4)
 
+#define SIMD_COERCE_INDEX(name, index)                                  \
+  Handle<Object> name_object;                                           \
+  ASSIGN_RETURN_FAILURE_ON_EXCEPTION(                                   \
+      isolate, name_object,                                             \
+      Object::ToLength(isolate, args.at<Object>(index)));               \
+  if (!name_object->IsNumber()) {                                       \

[bbudge, 2016/05/11 18:33:16]

Same comment as above.

[gdeepti, 2016/05/17 14:59:41]

Done.

+    THROW_NEW_ERROR_RETURN_FAILURE(                                     \
+        isolate, NewTypeError(MessageTemplate::kInvalidSimdOperation)); \
+  }                                                                     \
+  uint32_t name;                                                        \
+  name = name_object->Number();
 
 // Common Load and Store Functions
 
 #define SIMD_LOAD(type, lane_type, lane_count, count, result)          \
   static const int kLaneCount = lane_count;                            \
   DCHECK(args.length() == 2);                                          \
   CONVERT_SIMD_ARG_HANDLE_THROW(JSTypedArray, tarray, 0);              \
-  CONVERT_INT32_ARG_CHECKED(index, 1)                                  \
+  SIMD_COERCE_INDEX(lane, 1);                                          \

[bbudge, 2016/05/11 18:33:16]

s/lane/index

[gdeepti, 2016/05/17 14:59:41]

Done.

   size_t bpe = tarray->element_size();                                 \
   uint32_t bytes = count * sizeof(lane_type);                          \
   size_t byte_length = NumberToSize(isolate, tarray->byte_length());   \
-  RUNTIME_ASSERT(index >= 0 && index * bpe + bytes <= byte_length);    \
+  Handle<type> result;                                                 \
+  if (lane < 0 || byte_length < lane * bpe + bytes) {                  \
+    THROW_NEW_ERROR_RETURN_FAILURE(                                    \
+        isolate, NewRangeError(MessageTemplate::kInvalidSimdIndex));   \
+  }                                                                    \
   size_t tarray_offset = NumberToSize(isolate, tarray->byte_offset()); \
   uint8_t* tarray_base =                                               \
       static_cast<uint8_t*>(tarray->GetBuffer()->backing_store()) +    \
       tarray_offset;                                                   \
   lane_type lanes[kLaneCount] = {0};                                   \
-  memcpy(lanes, tarray_base + index * bpe, bytes);                     \
-  Handle<type> result = isolate->factory()->New##type(lanes);
-
+  memcpy(lanes, tarray_base + lane * bpe, bytes);                      \
+  result = isolate->factory()->New##type(lanes);
 
 #define SIMD_STORE(type, lane_type, lane_count, count, a)              \
   static const int kLaneCount = lane_count;                            \
   DCHECK(args.length() == 3);                                          \
   CONVERT_SIMD_ARG_HANDLE_THROW(JSTypedArray, tarray, 0);              \
   CONVERT_SIMD_ARG_HANDLE_THROW(type, a, 2);                           \
-  CONVERT_INT32_ARG_CHECKED(index, 1)                                  \
+  SIMD_COERCE_INDEX(lane, 1);                                          \
   size_t bpe = tarray->element_size();                                 \
   uint32_t bytes = count * sizeof(lane_type);                          \
   size_t byte_length = NumberToSize(isolate, tarray->byte_length());   \
-  RUNTIME_ASSERT(index >= 0 && index * bpe + bytes <= byte_length);    \
+  if (lane < 0 || byte_length < lane * bpe + bytes) {                  \
+    THROW_NEW_ERROR_RETURN_FAILURE(                                    \
+        isolate, NewRangeError(MessageTemplate::kInvalidSimdIndex));   \
+  }                                                                    \
   size_t tarray_offset = NumberToSize(isolate, tarray->byte_offset()); \
   uint8_t* tarray_base =                                               \
       static_cast<uint8_t*>(tarray->GetBuffer()->backing_store()) +    \
       tarray_offset;                                                   \
   lane_type lanes[kLaneCount];                                         \
   for (int i = 0; i < kLaneCount; i++) {                               \
     lanes[i] = a->get_lane(i);                                         \
   }                                                                    \
-  memcpy(tarray_base + index * bpe, lanes, bytes);
-
+  memcpy(tarray_base + lane * bpe, lanes, bytes);
 
 #define SIMD_LOAD_FUNCTION(type, lane_type, lane_count)         \
   RUNTIME_FUNCTION(Runtime_##type##Load) {                      \
     HandleScope scope(isolate);                                 \
     SIMD_LOAD(type, lane_type, lane_count, lane_count, result); \
     return *result;                                             \
   }
 
 
 #define SIMD_LOAD1_FUNCTION(type, lane_type, lane_count) \
@@ skipping 58 matching lines @@
 SIMD_LOADN_STOREN_TYPES(SIMD_LOAD3_FUNCTION)
 SIMD_NUMERIC_TYPES(SIMD_STORE_FUNCTION)
 SIMD_LOADN_STOREN_TYPES(SIMD_STORE1_FUNCTION)
 SIMD_LOADN_STOREN_TYPES(SIMD_STORE2_FUNCTION)
 SIMD_LOADN_STOREN_TYPES(SIMD_STORE3_FUNCTION)
 
 //-------------------------------------------------------------------
 
 }  // namespace internal
 }  // namespace v8