8025488: Error.captureStackTrace should not format error stack

Reviewed-by: hannesw, attila

src/jdk/nashorn/internal/objects/NativeError.java

@@ -37,10 +37,12 @@ import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.objects.ScriptFunctionImpl;
 import jdk.nashorn.internal.runtime.ECMAException;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
@@ -138,7 +140,10 @@ public final class NativeError extends ScriptObject {
         Global.checkObject(errorObj);
         final ScriptObject sobj = (ScriptObject)errorObj;
         final ECMAException exp = new ECMAException(sobj, null);
-        sobj.set("stack", getScriptStackString(sobj, exp), false);
+        sobj.delete("stack", false);
+        final ScriptFunction getStack = ScriptFunctionImpl.makeFunction("getStack", GET_STACK);
+        final ScriptFunction setStack = ScriptFunctionImpl.makeFunction("setStack", SET_STACK);
+        sobj.addOwnProperty("stack", Attribute.NOT_ENUMERABLE, getStack, setStack);
         return UNDEFINED;
     }
 

test/script/basic/JDK-8025488.js

+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8025488: Error.captureStackTrace should not format error stack
+ *
+ * @test
+ * @run
+ */
+
+
+function MyError () {
+    Error.call(this);
+    Error.captureStackTrace(this);
+    this.arr = {};
+};
+
+MyError.prototype.toString = function() {
+    return this.arr.toString();
+}
+
+var e = new MyError(); 
+print(e.stack);

test/script/basic/JDK-8025488.js.EXPECTED

+[object Object]
+	at MyError (test/script/basic/JDK-8025488.js:34)
+	at <program> (test/script/basic/JDK-8025488.js:42)