diff -r 000000000000 -r 6474c204b198 js/src/tests/ecma_5/extensions/eval-native-callback-is-indirect.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/tests/ecma_5/extensions/eval-native-callback-is-indirect.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,43 @@
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 604504;
+var summary = "eval called from a native function is indirect";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+var originalEval = eval;
+
+var global = this;
+var directCheckCode = "this === global";
+
+function testArrayGeneric()
+{
+  var global = "psych!";
+  var eval = Array.map;
+
+  var mapped = eval([directCheckCode], originalEval);
+  assertEq(mapped[0], true);
+}
+
+function testStringGeneric()
+{
+  var global = "psych!";
+  var eval = String.replace;
+
+  var newString = eval(directCheckCode, directCheckCode, originalEval);
+  assertEq(newString, "true");
+}
+testStringGeneric();
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");