@@ -935,9 +935,6 @@ test/staging/sm/String/string-upper-lower-mapping.js:
 test/staging/sm/TypedArray/constructor-buffer-sequence.js:
   default: 'Test262Error: Expected a ExpectedError but got a Error'
   strict mode: 'Test262Error: Expected a ExpectedError but got a Error'
-test/staging/sm/TypedArray/iterator-next-with-detached.js:
-  default: 'TypeError: Underlying ArrayBuffer has been detached from the view or out-of-bounds'
-  strict mode: 'TypeError: Underlying ArrayBuffer has been detached from the view or out-of-bounds'
 test/staging/sm/TypedArray/slice-memcpy.js:
   default: 'Test262Error: Actual [1, 2, 1, 2, 3, 4] and expected [1, 2, 1, 2, 1, 2] should have the same contents. '
   strict mode: 'Test262Error: Actual [1, 2, 1, 2, 3, 4] and expected [1, 2, 1, 2, 1, 2] should have the same contents. '
 
@@ -31,39 +31,40 @@ function next()
     if (!@isArrayIterator(this))
         @throwTypeError("%ArrayIteratorPrototype%.next requires that |this| be an Array Iterator instance");
 
+    var index = @getArrayIteratorInternalField(this, @arrayIteratorFieldIndex);
+    if (index === -1)
+        return { value: @undefined, done: true };
+
     var array = @getArrayIteratorInternalField(this, @arrayIteratorFieldIteratedObject);
     if (@isTypedArrayView(array) && @isDetached(array))
         @throwTypeError("Underlying ArrayBuffer has been detached from the view or out-of-bounds");
 
     var kind = @getArrayIteratorInternalField(this, @arrayIteratorFieldKind);
-    return @arrayIteratorNextHelper.@call(this, array, kind);
+    return @arrayIteratorNextHelper.@call(this, array, kind, index);
 }
 
 // FIXME: We have to have this because we can't implement this all as one function and meet our inlining heuristics.
 // Collectively, next and this have ~130 bytes of bytecodes but our limit is 120.
 @linkTimeConstant
-function arrayIteratorNextHelper(array, kind)
+function arrayIteratorNextHelper(array, kind, index)
 {
     "use strict";
     var done = true;
     var value;
 
-    var index = @getArrayIteratorInternalField(this, @arrayIteratorFieldIndex);
-    if (index !== -1) {
-        var length = @isTypedArrayView(array) ? @typedArrayLength(array) : @toLength(array.length);
-        if (index < length) {
-            @putArrayIteratorInternalField(this, @arrayIteratorFieldIndex, index + 1);
-            done = false;
-            if (kind === @iterationKindKey)
-                value = index;
-            else {
-                value = array[index];
-                if (kind === @iterationKindEntries)
-                    value = [index, value];
-            }
-        } else
-            @putArrayIteratorInternalField(this, @arrayIteratorFieldIndex, -1);
-    }
+    var length = @isTypedArrayView(array) ? @typedArrayLength(array) : @toLength(array.length);
+    if (index < length) {
+        @putArrayIteratorInternalField(this, @arrayIteratorFieldIndex, index + 1);
+        done = false;
+        if (kind === @iterationKindKey)
+            value = index;
+        else {
+            value = array[index];
+            if (kind === @iterationKindEntries)
+                value = [index, value];
+        }
+    } else
+        @putArrayIteratorInternalField(this, @arrayIteratorFieldIndex, -1);
 
     return { value, done };
 }