Index: src/runtime/runtime-array.cc |
diff --git a/src/runtime/runtime-array.cc b/src/runtime/runtime-array.cc |
index 1df42c424c33f9ee06112b0e80d241b3ca0390f4..b72a23a48018be48d87804b44ddba917bbe02e92 100644 |
--- a/src/runtime/runtime-array.cc |
+++ b/src/runtime/runtime-array.cc |
@@ -461,8 +461,12 @@ static bool IterateElements(Isolate* isolate, Handle<JSObject> receiver, |
Handle<Object> key(isolate->heap()->length_string(), isolate); |
ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, val, |
Runtime::GetObjectProperty(isolate, receiver, key), false); |
- // TODO(caitp): implement ToLength() abstract operation for C++ |
- val->ToUint32(&length); |
+ // TODO(caitp): Support larger element indexes (up to 2^53-1). |
+ if (!val->ToUint32(&length)) { |
+ ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, val, |
+ Execution::ToLength(isolate, val), false); |
+ val->ToUint32(&length); |
+ } |
} |
switch (receiver->GetElementsKind()) { |