[GR-78747] Fix iterator closing for Array.from and collection constructors.

PullRequest: js/3887

Author: woess

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ArrayFunctionBuiltins.java

@@ -305,23 +305,23 @@ protected Object arrayFromIterable(Object thisObj, Object items, Object usingIte
 
         private Object arrayFromIteratorRecord(Object obj, IteratorRecord iteratorRecord, Object mapFn, Object thisArg, boolean mapping) {
             long k = 0;
-            try {
-                while (true) {
-                    Object next = iteratorStep(iteratorRecord);
-                    if (next == Boolean.FALSE) {
-                        setLength(obj, k);
-                        return obj;
-                    }
-                    Object mapped = getIteratorValue(next);
+            while (true) {
+                Object next = iteratorStep(iteratorRecord);
+                if (next == Boolean.FALSE) {
+                    setLength(obj, k);
+                    return obj;
+                }
+                Object mapped = getIteratorValue(next);
+                try {
                     if (mapping) {
                         mapped = callMapFn(thisArg, mapFn, mapped, JSRuntime.positiveLongToIntOrDouble(k));
                     }
                     writeOwn(obj, k, mapped);
                     k++;
+                } catch (AbstractTruffleException ex) {
+                    iteratorCloseAbrupt(iteratorRecord);
+                    throw ex; // should be executed by iteratorClose
                 }
-            } catch (AbstractTruffleException ex) {
-                iteratorCloseAbrupt(iteratorRecord);
-                throw ex; // should be executed by iteratorClose
             }
         }
 

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ConstructorBuiltins.java

@@ -3009,24 +3009,24 @@ protected final JSObject constructMapFromIterable(JSDynamicObject newTarget, Obj
             }
             IteratorRecord iter = getIteratorNode.execute(node, iterable);
 
-            try {
-                while (true) {
-                    Object next = iteratorStep(iter);
-                    if (next == Boolean.FALSE) {
-                        break;
-                    }
-                    Object nextItem = getIteratorValue(next);
+            while (true) {
+                Object next = iteratorStep(iter);
+                if (next == Boolean.FALSE) {
+                    break;
+                }
+                Object nextItem = getIteratorValue(next);
+                try {
                     if (!isObjectNode.executeBoolean(nextItem)) {
                         errorBranch.enter(node);
                         throw Errors.createTypeErrorIteratorResultNotObject(nextItem, this);
                     }
                     Object k = readElementNode.executeWithTargetAndIndex(nextItem, 0);
                     Object v = readElementNode.executeWithTargetAndIndex(nextItem, 1);
                     call(mapObj, adder, k, v);
+                } catch (AbstractTruffleException ex) {
+                    iteratorCloseAbrupt(iter);
+                    throw ex;
                 }
-            } catch (AbstractTruffleException ex) {
-                iteratorCloseAbrupt(iter);
-                throw ex;
             }
 
             return mapObj;
@@ -3074,18 +3074,18 @@ protected JSObject constructSetFromIterable(JSDynamicObject newTarget, Object it
             }
             IteratorRecord iter = getIteratorNode.execute(node, iterable);
 
-            try {
-                while (true) {
-                    Object next = iteratorStep(iter);
-                    if (next == Boolean.FALSE) {
-                        break;
-                    }
-                    Object nextValue = getIteratorValue(next);
+            while (true) {
+                Object next = iteratorStep(iter);
+                if (next == Boolean.FALSE) {
+                    break;
+                }
+                Object nextValue = getIteratorValue(next);
+                try {
                     call(setObj, adder, nextValue);
+                } catch (AbstractTruffleException ex) {
+                    iteratorCloseAbrupt(iter);
+                    throw ex;
                 }
-            } catch (AbstractTruffleException ex) {
-                iteratorCloseAbrupt(iter);
-                throw ex;
             }
 
             return setObj;

graal-js/test/test262.json

@@ -2256,10 +2256,6 @@
       "STAGING" : "PASS"
     },
     "comment" : "nonextensible-applies-to-private proposal"
-  }, {
-    "filePath" : "staging/sm/Array/from-iterator-close.js",
-    "status" : "FAIL",
-    "comment" : "new failures 2025-01-23"
   }, {
     "filePath" : "staging/sm/Array/length-truncate-nonconfigurable-sparse.js",
     "status" : "SKIP",
@@ -2334,10 +2330,6 @@
     "filePath" : "staging/sm/lexical-environment/block-scoped-functions-deprecated-redecl.js",
     "status" : "FAIL",
     "comment" : "new failures 2025-01-23"
-  }, {
-    "filePath" : "staging/sm/Map/constructor-iterator-close.js",
-    "status" : "FAIL",
-    "comment" : "new failures 2025-01-23"
   }, {
     "filePath" : "staging/sm/Math/exp-exact.js",
     "status" : "PASS",