4 files changed, 95 insertions, 0 deletions
diff --git a/js/src/tests/js1_7/GC/browser.js b/js/src/tests/js1_7/GC/browser.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/js1_7/GC/browser.js
diff --git a/js/src/tests/js1_7/GC/regress-341675.js b/js/src/tests/js1_7/GC/regress-341675.js
new file mode 100644
index 000000000..5dc7086a2
--- /dev/null
+++ b/js/src/tests/js1_7/GC/regress-341675.js
@@ -0,0 +1,35 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 341675;
+var summary = 'Iterators: still infinite loop during GC';
+var actual = 'No Crash';
+var expect = 'No Crash';
+
+printBugNumber(BUGNUMBER);
+printStatus (summary);
+
+var globalToPokeGC = {};
+
+function generator()
+{
+  try {
+    yield [];
+  } finally {
+    make_iterator();
+  }
+}
+
+function make_iterator()
+{
+  var iter = generator();
+  iter.next();
+}
+
+make_iterator();
+gc();
+
+reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_7/GC/regress-381374.js b/js/src/tests/js1_7/GC/regress-381374.js
new file mode 100644
index 000000000..4ad86780c
--- /dev/null
+++ b/js/src/tests/js1_7/GC/regress-381374.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(Android)
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 381374;
+var summary = 'js_AddScopeProperty - overwrite property with watchpoint';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+ 
+  function huh()
+  {
+    var f;
+
+    Iterator; // ???
+
+    if (0 && 0) {
+      eval(""); // ???
+    }
+
+    f = new Function("x = 1");
+
+    try {
+      f();
+    } catch(e) {}
+  }
+
+  this.watch('x', function(){});
+  this.__defineGetter__('x', new Function());
+  huh();
+  if (typeof gczeal == 'function')
+  {
+    gczeal(2); 
+  }
+
+  for (y in [0,1]) { this.__defineSetter__('x', function(){}); }
+
+  if (typeof gczeal == 'function')
+  {
+    gczeal(0);
+  }
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_7/GC/shell.js b/js/src/tests/js1_7/GC/shell.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/js1_7/GC/shell.js