From 6a0b70e242d8b9c02d75b9e041dba358e89f0df3 Mon Sep 17 00:00:00 2001
From: Priya Lakshmi Muthuswamy <priya.lakshmi.muthuswamy@oracle.com>
Date: Mon, 23 Oct 2017 13:03:01 +0200
Subject: [PATCH] 8165198: Inconsistent values with JavaImporter after
 accessing undefined variable

Reviewed-by: sundar, hannesw
---
 .../internal/runtime/ScriptObject.java        |  2 +-
 .../nashorn/internal/runtime/WithObject.java  |  4 +-
 test/nashorn/script/nosecurity/JDK-8165198.js | 37 +++++++++++++++++++
 .../script/nosecurity/JDK-8165198.js.EXPECTED |  2 +
 4 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 test/nashorn/script/nosecurity/JDK-8165198.js
 create mode 100644 test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED

diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
index 3a238dc5d8c..3008114171f 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -2136,7 +2136,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
 
     // Similar to getProtoSwitchPoints method above, but used for additional prototype switchpoints of
     // properties that are known not to exist, e.g. the original property name in a __noSuchProperty__ invocation.
-    private SwitchPoint getProtoSwitchPoint(final String name) {
+    final SwitchPoint getProtoSwitchPoint(final String name) {
         if (getProto() == null) {
             return null;
         }
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
index f58fc7de300..f958bf8fe68 100644
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
@@ -138,9 +138,9 @@ public final class WithObject extends Scope {
             find = expression.findProperty(fallBack, true);
             if (find != null) {
                 if (NO_SUCH_METHOD_NAME.equals(fallBack)) {
-                    link = expression.noSuchMethod(desc, request);
+                    link = expression.noSuchMethod(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
                 } else if (NO_SUCH_PROPERTY_NAME.equals(fallBack)) {
-                    link = expression.noSuchProperty(desc, request);
+                    link = expression.noSuchProperty(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
                 }
             }
         }
diff --git a/test/nashorn/script/nosecurity/JDK-8165198.js b/test/nashorn/script/nosecurity/JDK-8165198.js
new file mode 100644
index 00000000000..2263ef5f037
--- /dev/null
+++ b/test/nashorn/script/nosecurity/JDK-8165198.js
@@ -0,0 +1,37 @@
+/*
+ * 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-8165198:  Inconsistent values with JavaImporter after accessing undefined variable
+ *
+ * @test
+ * @run
+ */
+
+var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
+var e = new NashornScriptEngineFactory().getScriptEngine("-ot=false");
+var output = e.eval("with(new JavaImporter(java.util)){x}");
+print(output);
+e.eval("with(new JavaImporter(java.util)){x=1}");
+var output2 = e.eval("with(new JavaImporter(java.util)){x}");
+print(output2);
diff --git a/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED b/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED
new file mode 100644
index 00000000000..cadbdf5ee2b
--- /dev/null
+++ b/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED
@@ -0,0 +1,2 @@
+null
+1