From b0873269dc6054514d085b9357b3a29aa19e0bc0 Mon Sep 17 00:00:00 2001 From: Attila Szegedi Date: Thu, 15 May 2014 15:28:51 +0200 Subject: [PATCH] 8043235: Type-based optimizations interfere with continuation methods Reviewed-by: jlaskey, lagergren --- .../internal/codegen/CodeGenerator.java | 54 +++++++++++++++++ nashorn/test/script/basic/JDK-8043235.js | 58 +++++++++++++++++++ .../test/script/basic/JDK-8043235.js.EXPECTED | 2 + 3 files changed, 114 insertions(+) create mode 100644 nashorn/test/script/basic/JDK-8043235.js create mode 100644 nashorn/test/script/basic/JDK-8043235.js.EXPECTED diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java index 282aca8be00..b0d81a83d0f 100644 --- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java +++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java @@ -2383,6 +2383,14 @@ final class CodeGenerator extends NodeOperatorVisitor() { + boolean contains; + @Override + public Boolean get() { + rootExpr.accept(new NodeVisitor(new LexicalContext()) { + @Override + public boolean enterFunctionNode(FunctionNode functionNode) { + return false; + } + @Override + public boolean enterDefault(final Node node) { + if(!contains && node instanceof Optimistic) { + final int pp = ((Optimistic)node).getProgramPoint(); + contains = isValid(pp) && env.isContinuationEntryPoint(pp); + } + return !contains; + } + }); + return contains; + } + }.get(); + } + private void loadRuntimeNode(final RuntimeNode runtimeNode) { final List args = new ArrayList<>(runtimeNode.getArgs()); if (nullCheck(runtimeNode, args)) { diff --git a/nashorn/test/script/basic/JDK-8043235.js b/nashorn/test/script/basic/JDK-8043235.js new file mode 100644 index 00000000000..6f0ec275bbf --- /dev/null +++ b/nashorn/test/script/basic/JDK-8043235.js @@ -0,0 +1,58 @@ +/* + * 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-8043235: Type-based optimizations interfere with continuation methods + * + * @test + * @run + */ + +function g() { + return "Hello World!" +} + +function f1() { + var c; + var paused = false; + // If we didn't disable nullCheck specialization for expressions + // containing a deoptimization site, we'd get an AssertionError + while (!paused && (null !== (c = g()))) { + print(c); + paused = true; + } +} + +function f2() { + var c; + var paused = false; + // If we didn't disable undefinedCheck specialization for expressions + // containing a deoptimization site, we'd get an AssertionError + while (!paused && (undefined !== (c = g()))) { + print(c); + paused = true; + } +} + +f1(); +f2(); diff --git a/nashorn/test/script/basic/JDK-8043235.js.EXPECTED b/nashorn/test/script/basic/JDK-8043235.js.EXPECTED new file mode 100644 index 00000000000..f28b39131ac --- /dev/null +++ b/nashorn/test/script/basic/JDK-8043235.js.EXPECTED @@ -0,0 +1,2 @@ +Hello World! +Hello World!