changeset 47299:8eb5e3ccee56 jdk-10+25

8188098: NPE in SimpleTreeVisitorES6 visitor when parsing a tagged template literal Reviewed-by: hannesw, jlaskey
author sundar
date Thu, 28 Sep 2017 23:03:17 +0530
parents cd02250e9370
children 9ca862331fb4 9d5b6fa13d83
files src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java test/nashorn/script/basic/JDK-8188098.js test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8188098_Test.java
diffstat 3 files changed, 106 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java	Thu Sep 28 18:30:35 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Parser.java	Thu Sep 28 23:03:17 2017 +0530
@@ -5109,8 +5109,13 @@
 
         final LiteralNode<Expression[]> rawStringArray = LiteralNode.newInstance(templateToken, finish, rawStrings);
         final LiteralNode<Expression[]> cookedStringArray = LiteralNode.newInstance(templateToken, finish, cookedStrings);
-        final RuntimeNode templateObject = new RuntimeNode(templateToken, finish, RuntimeNode.Request.GET_TEMPLATE_OBJECT, rawStringArray, cookedStringArray);
-        argumentList.set(0, templateObject);
+
+        if (!env._parse_only) {
+            final RuntimeNode templateObject = new RuntimeNode(templateToken, finish, RuntimeNode.Request.GET_TEMPLATE_OBJECT, rawStringArray, cookedStringArray);
+            argumentList.set(0, templateObject);
+        } else {
+            argumentList.set(0, rawStringArray);
+        }
         return optimizeList(argumentList);
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8188098.js	Thu Sep 28 23:03:17 2017 +0530
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2017, 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-8188098:NPE in SimpleTreeVisitorES6 visitor when parsing a tagged template literal
+ *
+ * @test
+ * @run
+ */
+
+var Parser = Java.type("jdk.nashorn.api.tree.Parser");
+var MemberSelectTree = Java.type("jdk.nashorn.api.tree.MemberSelectTree");
+var SimpleTreeVisitor = Java.type("jdk.nashorn.api.tree.SimpleTreeVisitorES6");
+var parser = Parser.create("--language=es6");
+
+var ast = parser.parse("hello.js", "foo`PI (${Math.PI}) is transcendental`", print);
+
+var reachedCall = false;
+ast.accept(new (Java.extend(SimpleTreeVisitor)) {
+    visitFunctionCall: function(node, extra) {
+        reachedCall = true;
+        Assert.assertTrue(node.functionSelect.name == "foo");
+        var args = node.arguments;
+        Assert.assertTrue(args.size() == 2);
+        var strs = args.get(0).elements;
+        Assert.assertTrue(String(strs.get(0).value) == "PI (");
+        Assert.assertTrue(String(strs.get(1).value) == ") is transcendental");
+        var expr = args.get(1);
+        Assert.assertTrue(expr instanceof MemberSelectTree);
+        Assert.assertTrue(expr.expression.name == "Math");
+        Assert.assertTrue(expr.identifier == "PI");
+    }
+}, null);
+
+Assert.assertTrue(reachedCall);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/src/jdk/nashorn/api/tree/test/JDK_8188098_Test.java	Thu Sep 28 23:03:17 2017 +0530
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package jdk.nashorn.api.tree.test;
+
+import jdk.nashorn.api.tree.Parser;
+import jdk.nashorn.api.tree.SimpleTreeVisitorES6;
+import org.testng.annotations.Test;
+
+/**
+ * 8188098: NPE in SimpleTreeVisitorES6 visitor when parsing a tagged template literal
+ *
+ * @test
+ * @run testng jdk.nashorn.api.tree.test.JDK_8188098_Test
+ */
+public class JDK_8188098_Test {
+    @Test
+    public void test() {
+        Parser p = Parser.create("--language=es6");
+        p.parse("test", "foo`hello world`", System.out::println).
+            accept(new SimpleTreeVisitorES6<Void, Void>(), null);
+    }
+}