Merge

nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java

@@ -1325,6 +1325,9 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * Flag this object as having a prototype.
      */
     public void setIsPrototype() {
+        if (proto != null && !isPrototype()) {
+            proto.addPropertyListener(this);
+        }
         flags |= IS_PROTOTYPE;
     }
 

nashorn/test/script/basic/JDK-8013729.js

@@ -0,0 +1,49 @@
+/*
+ * 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-8013729: SwitchPoint invalidation not working over prototype chain
+ *
+ * @test
+ * @run
+ */
+
+var a = {x: 1};
+var b = Object.create(a, {y: {value: 2, configurable: true, writable: true}});
+var c = Object.create(b);
+var d = Object.create(c);
+
+function p() {
+    print(d.x);
+    print(d.y);
+}
+
+p();
+
+// Delete, then redefine properties
+delete a.x;
+delete b.y;
+a.x = 10;
+b.y = 20;
+
+p();

nashorn/test/script/basic/JDK-8013729.js.EXPECTED

@@ -0,0 +1,4 @@
+1
+2
+10
+20