# HG changeset patch
# User jlaskey
# Date 1367511816 10800
# Node ID de95f0ccc5cfbb41c1c821d8ff10174ae9778596
# Parent  953eaa0cb8d5af74ec3f6d6807b17b29dfdda91e# Parent  fed0d7b5d9f60aba2768f6a9099465e3dcec077e
Merge

diff -r 953eaa0cb8d5 -r de95f0ccc5cf nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java	Thu May 02 13:22:46 2013 -0300
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java	Thu May 02 13:23:36 2013 -0300
@@ -1325,6 +1325,9 @@
      * Flag this object as having a prototype.
      */
     public void setIsPrototype() {
+        if (proto != null && !isPrototype()) {
+            proto.addPropertyListener(this);
+        }
         flags |= IS_PROTOTYPE;
     }
 
diff -r 953eaa0cb8d5 -r de95f0ccc5cf nashorn/test/script/basic/JDK-8013729.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8013729.js	Thu May 02 13:23:36 2013 -0300
@@ -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();
diff -r 953eaa0cb8d5 -r de95f0ccc5cf nashorn/test/script/basic/JDK-8013729.js.EXPECTED
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8013729.js.EXPECTED	Thu May 02 13:23:36 2013 -0300
@@ -0,0 +1,4 @@
+1
+2
+10
+20