Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Fri Feb 10 11:44:35 2017 -0800
     1.2 +++ b/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Fri Mar 10 18:30:39 2017 +0100
     1.3 @@ -175,6 +175,8 @@
     1.4              final int index = getIndex((Number)key);
     1.5              if (index > -1) {
     1.6                  return ((JSObject)jsobj).getSlot(index);
     1.7 +            } else {
     1.8 +                return ((JSObject)jsobj).getMember(JSType.toString(key));
     1.9              }
    1.10          } else if (isString(key)) {
    1.11              final String name = key.toString();
    1.12 @@ -192,7 +194,12 @@
    1.13          if (key instanceof Integer) {
    1.14              ((JSObject)jsobj).setSlot((Integer)key, value);
    1.15          } else if (key instanceof Number) {
    1.16 -            ((JSObject)jsobj).setSlot(getIndex((Number)key), value);
    1.17 +            final int index = getIndex((Number)key);
    1.18 +            if (index > -1) {
    1.19 +                ((JSObject)jsobj).setSlot(index, value);
    1.20 +            } else {
    1.21 +                ((JSObject)jsobj).setMember(JSType.toString(key), value);
    1.22 +            }
    1.23          } else if (isString(key)) {
    1.24              ((JSObject)jsobj).setMember(key.toString(), value);
    1.25          }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8176511.js	Fri Mar 10 18:30:39 2017 +0100
     2.3 @@ -0,0 +1,50 @@
     2.4 +/*
     2.5 + * Copyright (c) 2017, 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-8176511: JSObject property access is broken for numeric keys outside the int range
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +
    2.35 +var reassignWithNewGlobal = loadWithNewGlobal({
    2.36 +    script: '(function (o, i) { o[i] = o[i]; })', name: 'internal.js'
    2.37 +
    2.38 +});
    2.39 +
    2.40 +function test(i) {
    2.41 +    var o = {};
    2.42 +    o[i] = true;
    2.43 +    var before = JSON.stringify(o);
    2.44 +    reassignWithNewGlobal(o, i);
    2.45 +    var after = JSON.stringify(o);
    2.46 +    Assert.assertEquals(before, after);
    2.47 +}
    2.48 +
    2.49 +test(-2147483649);
    2.50 +test(-2147483648);
    2.51 +test(2147483647);
    2.52 +test(2147483648);
    2.53 +