From a2316e8005dd7971b974c95de8f5be2a5c4b7eb3 Mon Sep 17 00:00:00 2001
From: Luke Wagner <lw@mozilla.com>
Date: Mon, 4 Oct 2010 16:22:26 -0700
Subject: [PATCH] Bug 601505 - Error instances don't have [[Construct]]
 (r=brendan)

--HG--
extra : rebase_source : 12c4c0432ca571f57993cabe3309810cfa3866d1
---
 js/src/jsexn.cpp                            |  2 +-
 js/src/tests/ecma_3/Exceptions/15.11.5.js   | 65 +++++++++++++++++++++
 js/src/tests/ecma_3/Exceptions/jstests.list |  1 +
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 js/src/tests/ecma_3/Exceptions/15.11.5.js

diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index c21b0c396560..d7b5e414a74b 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -101,7 +101,7 @@ Class js_ErrorClass = {
     NULL,           /* reserved0   */
     NULL,           /* checkAccess */
     NULL,           /* call        */
-    Exception,      /* construct   */
+    NULL,           /* construct   */
     NULL,           /* xdrObject   */
     NULL,           /* hasInstance */
     JS_CLASS_TRACE(exn_trace)
diff --git a/js/src/tests/ecma_3/Exceptions/15.11.5.js b/js/src/tests/ecma_3/Exceptions/15.11.5.js
new file mode 100644
index 000000000000..351a82bc95a0
--- /dev/null
+++ b/js/src/tests/ecma_3/Exceptions/15.11.5.js
@@ -0,0 +1,65 @@
+/* -*- 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 Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * 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 ***** */
+
+/*
+ *
+ * Date:    4 Oct 2010
+ * SUMMARY: Error instances have no special properties beyond those inherited
+ *          from the Error prototype object
+ */
+//-----------------------------------------------------------------------------
+var summary = 'Error instances have no special properties beyond those inherited the Error prototype object';
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printStatus (summary);
+
+  var actual = '';
+  var expect = 'TypeError: Error.prototype is not a constructor';
+  try {
+      new Error.prototype;
+  } catch (e) {
+      actual = '' + e;
+  }
+
+  reportCompare(actual, expect, "not a constructor");
+
+  exitFunc ('test');
+}
diff --git a/js/src/tests/ecma_3/Exceptions/jstests.list b/js/src/tests/ecma_3/Exceptions/jstests.list
index 941b1aadf308..fc7aa883e5d7 100644
--- a/js/src/tests/ecma_3/Exceptions/jstests.list
+++ b/js/src/tests/ecma_3/Exceptions/jstests.list
@@ -1,6 +1,7 @@
 url-prefix ../../jsreftest.html?test=ecma_3/Exceptions/
 script 15.11.1.1.js
 script 15.11.4.4-1.js
+script 15.11.5.js
 script 15.11.7.6-001.js
 script 15.11.7.6-002.js
 script 15.11.7.6-003.js