JavaScript Test Library - modifications to tests from Igor Bukanov, bug 347739

js/tests/js1_7/iterable/regress-340526-02.js

@@ -38,22 +38,36 @@
 var bug = 340526;
 var summary = 'Iterators: cross-referenced objects with close handler can ' + 
   'delay close handler execution';
-var actual = 'No Crash';
-var expect = 'No Crash';
 
 printBugNumber (bug);
 printStatus (summary);
 
-try
+var close_count = 0;
+
+function gen()
 {
-  var iter = (function() { yield 0; })();
-  iter.close = function() { new Object(); }
-  iter = null;
-  gc();
+  try {
+    yield 0;
+  } finally {
+    ++close_count;
+  }
 }
-catch(ex)
-{
-  writeLineToLog(ex + '');
-}
-  
+
+var iter1 = gen();
+var iter2 = gen();
+
+iter1.another = iter2;
+iter2.another = iter1;
+
+iter1.next();
+iter2.next();
+
+iter1 = null;
+iter2 = null;
+
+gc();
+
+var expect = 2;
+var actual = close_count;
+
 reportCompare(expect, actual, summary);

js/tests/js1_7/iterable/regress-341499.js

@@ -44,8 +44,21 @@ var expect = 'No Crash';
 printBugNumber (bug);
 printStatus (summary);
 
-var iter = (function() { yield 0; })();
-iter.close = function() { return []; }
+var someGlobal;
+
+function generator()
+{
+  try {
+    yield 0;
+  } finally {
+    someGlobal = [];
+  }
+}
+
+var iter = generator();
+iter.next();
+iter = null;
+
 gc();
 
 reportCompare(expect, actual, summary);

js/tests/js1_7/iterable/regress-341500.js

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is JavaScript Engine testing utilities.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Igor Bukanov
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-//-----------------------------------------------------------------------------
-var bug = 341500;
-var summary = 'Iterators: crash in close handler with assignment to ' +
-  'non-existing name';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-printBugNumber (bug);
-printStatus (summary);
-
-function gen(i) { yield i; }
-var iter = gen(1);
-iter.close = function() { name_that_does_not_exist_in_the_scope_chain = 1; }
-iter = null;
-gc();
-
-reportCompare(expect, actual, summary);

js/tests/js1_7/iterable/regress-341815.js

@@ -51,13 +51,18 @@ function test()
   printBugNumber (bug);
   printStatus (summary);
 
-
   var globalToPokeGC = {};
 
   function make_iterator()
   {
-    var iter = (function() { yield 0; })();
-    iter.close = make_iterator;
+    function generator() {
+      try {
+        yield 0;
+      } finally {
+        make_iterator();
+      }
+    }
+    generator().next();
     globalToPokeGC = {};
     if (typeof alert != 'undefined')
     {