8026692: eval() throws NullPointerException with --compile-only
Reviewed-by: sundar, lagergren
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java Tue Oct 15 13:14:04 2013 -0300
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java Wed Oct 16 10:12:22 2013 +0200
@@ -162,7 +162,7 @@
LOWERING_PHASE(EnumSet.of(INITIALIZED, PARSED, CONSTANT_FOLDED)) {
@Override
FunctionNode transform(final Compiler compiler, final FunctionNode fn) {
- return (FunctionNode)fn.accept(new Lower(compiler));
+ return (FunctionNode)fn.accept(new Lower(compiler.getCodeInstaller()));
}
@Override
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java Tue Oct 15 13:14:04 2013 -0300
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java Wed Oct 16 10:12:22 2013 +0200
@@ -68,6 +68,7 @@
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.parser.Token;
import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.CodeInstaller;
import jdk.nashorn.internal.runtime.DebugLogger;
import jdk.nashorn.internal.runtime.ScriptRuntime;
import jdk.nashorn.internal.runtime.Source;
@@ -86,13 +87,13 @@
private static final DebugLogger LOG = new DebugLogger("lower");
- // needed only to get unique eval id from code installer
- private final Compiler compiler;
+ // needed only to get unique eval id
+ private final CodeInstaller installer;
/**
* Constructor.
*/
- Lower(final Compiler compiler) {
+ Lower(final CodeInstaller installer) {
super(new BlockLexicalContext() {
@Override
@@ -135,7 +136,7 @@
return block.setIsTerminal(this, false);
}
});
- this.compiler = compiler;
+ this.installer = installer;
}
@Override
@@ -534,6 +535,8 @@
private String evalLocation(final IdentNode node) {
final Source source = lc.getCurrentFunction().getSource();
final int pos = node.position();
+ // Code installer is null when running with --compile-only, use 0 as id in that case
+ final long id = installer == null ? 0 : installer.getUniqueEvalId();
return new StringBuilder().
append(source.getName()).
append('#').
@@ -541,7 +544,7 @@
append(':').
append(source.getColumn(pos)).
append("<eval>@").
- append(compiler.getCodeInstaller().getUniqueEvalId()).
+ append(id).
toString();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8026692.js Wed Oct 16 10:12:22 2013 +0200
@@ -0,0 +1,32 @@
+/*
+ * 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-8026692: eval() throws NullPointerException with --compile-only
+ *
+ * @test
+ * @option --compile-only
+ * @run
+ */
+
+eval("");