changeset 24760:183f11df79ee

8043431: Fix yet another corner case of JDK-8041995 Reviewed-by: hannesw, lagergren
author attila
date Mon, 19 May 2014 18:24:12 +0200
parents 31aed7d9c02a
children 1b7863853fbc
files nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java nashorn/test/script/basic/JDK-8043431.js nashorn/test/script/basic/JDK-8043431.js.EXPECTED
diffstat 3 files changed, 48 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Mon May 19 15:29:42 2014 +0200
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Mon May 19 18:24:12 2014 +0200
@@ -2256,6 +2256,11 @@
                     }
 
                     @Override
+                    public boolean enterObjectNode(ObjectNode objectNode) {
+                        return false;
+                    }
+
+                    @Override
                     public boolean enterDefault(final Node node) {
                         if (contains) {
                             return false;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8043431.js	Mon May 19 18:24:12 2014 +0200
@@ -0,0 +1,42 @@
+/*
+ * 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-8043431: Fix yet another corner case of JDK-8041995
+ *
+ * @test
+ * @run
+ */
+
+var a = "Hello World!";
+
+// Without the fix, evaluating "a" optimistically will start a 
+// deoptimizing recompilation in a nested object literal, and trigger an
+// assertion in code generator.
+var x = {
+    foo: {
+        value: a
+    }
+};
+
+print(x.foo.value);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8043431.js.EXPECTED	Mon May 19 18:24:12 2014 +0200
@@ -0,0 +1,1 @@
+Hello World!