diff -r 000000000000 -r 6474c204b198 js/src/tests/js1_5/extensions/regress-361571.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/tests/js1_5/extensions/regress-361571.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,38 @@
+/* -*- 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 = 361571;
+var summary = 'Do not assert: fp->scopeChain == parent';
+var actual = 'No Crash';
+var expect = 'No Crash';
+
+//-----------------------------------------------------------------------------
+test();
+//-----------------------------------------------------------------------------
+
+function test()
+{
+  enterFunc ('test');
+  printBugNumber(BUGNUMBER);
+  printStatus (summary);
+
+  try
+  {
+    o = {};
+    o.__defineSetter__('y', eval);
+    o.watch('y', function () { return "";});
+    o.y = 1;
+  }
+  catch(ex)
+  {
+    printStatus('Note eval can no longer be called directly');
+    expect = 'EvalError: function eval must be called directly, and not by way of a function of another name';
+    actual = ex + '';
+  }
+  reportCompare(expect, actual, summary);
+
+  exitFunc ('test');
+}