4 files changed, 57 insertions, 0 deletions
diff --git a/js/src/tests/js1_8_1/JSON/browser.js b/js/src/tests/js1_8_1/JSON/browser.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/js1_8_1/JSON/browser.js
diff --git a/js/src/tests/js1_8_1/JSON/regress-458959.js b/js/src/tests/js1_8_1/JSON/regress-458959.js
new file mode 100644
index 000000000..04c606c5b
--- /dev/null
+++ b/js/src/tests/js1_8_1/JSON/regress-458959.js
@@ -0,0 +1,32 @@
+/* -*- 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 = 458959;
+var summary = 'this.JSON should not be enumerable';
+var actual = '';
+var expect = '';
+
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+ 
+  for (var i in this) 
+  {
+    if (i.toString() == 'JSON')
+      actual = i;
+  }
+
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/js1_8_1/JSON/regress-459293.js b/js/src/tests/js1_8_1/JSON/regress-459293.js
new file mode 100644
index 000000000..fbd46589c
--- /dev/null
+++ b/js/src/tests/js1_8_1/JSON/regress-459293.js
@@ -0,0 +1,25 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ * Contributor: Robert Sayre
+ */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 459293;
+var summary = 'Allow redeclaration of JSON';
+var actual = '';
+var expect = '';
+
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+ 
+  try
+  {
+    eval('var JSON = "foo";');
+  }
+  catch(ex)
+  {
+    actual = ex + '';
+  }
+  reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_8_1/JSON/shell.js b/js/src/tests/js1_8_1/JSON/shell.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/js1_8_1/JSON/shell.js