8013729: SwitchPoint invalidation not working over prototype chain

Thu, 02 May 2013 09:19:44 +0200

author
hannesw
date
Thu, 02 May 2013 09:19:44 +0200
changeset 243
80cb02dedc83
parent 242
b754fb89367d
child 245
9c2376a250b6

8013729: SwitchPoint invalidation not working over prototype chain
Reviewed-by: lagergren, sundar

src/jdk/nashorn/internal/runtime/ScriptObject.java file | annotate | diff | comparison | revisions
test/script/basic/JDK-8013729.js file | annotate | diff | comparison | revisions
test/script/basic/JDK-8013729.js.EXPECTED file | annotate | diff | comparison | revisions
     1.1 --- a/src/jdk/nashorn/internal/runtime/ScriptObject.java	Tue Apr 30 10:05:42 2013 -0300
     1.2 +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java	Thu May 02 09:19:44 2013 +0200
     1.3 @@ -1325,6 +1325,9 @@
     1.4       * Flag this object as having a prototype.
     1.5       */
     1.6      public void setIsPrototype() {
     1.7 +        if (proto != null && !isPrototype()) {
     1.8 +            proto.addPropertyListener(this);
     1.9 +        }
    1.10          flags |= IS_PROTOTYPE;
    1.11      }
    1.12  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8013729.js	Thu May 02 09:19:44 2013 +0200
     2.3 @@ -0,0 +1,49 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8013729: SwitchPoint invalidation not working over prototype chain
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var a = {x: 1};
    2.35 +var b = Object.create(a, {y: {value: 2, configurable: true, writable: true}});
    2.36 +var c = Object.create(b);
    2.37 +var d = Object.create(c);
    2.38 +
    2.39 +function p() {
    2.40 +    print(d.x);
    2.41 +    print(d.y);
    2.42 +}
    2.43 +
    2.44 +p();
    2.45 +
    2.46 +// Delete, then redefine properties
    2.47 +delete a.x;
    2.48 +delete b.y;
    2.49 +a.x = 10;
    2.50 +b.y = 20;
    2.51 +
    2.52 +p();
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8013729.js.EXPECTED	Thu May 02 09:19:44 2013 +0200
     3.3 @@ -0,0 +1,4 @@
     3.4 +1
     3.5 +2
     3.6 +10
     3.7 +20

mercurial