Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeArray.java	Mon Sep 30 10:24:42 2013 -0300
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeArray.java	Mon Sep 30 12:06:43 2013 -0300
     1.3 @@ -819,8 +819,15 @@
     1.4              if (bulkable(sobj)) {
     1.5                  sobj.getArray().shiftLeft(1);
     1.6              } else {
     1.7 +                boolean hasPrevious = true;
     1.8                  for (long k = 1; k < len; k++) {
     1.9 -                    sobj.set(k - 1, sobj.get(k), true);
    1.10 +                    boolean hasCurrent = sobj.has(k);
    1.11 +                    if (hasCurrent) {
    1.12 +                        sobj.set(k - 1, sobj.get(k), true);
    1.13 +                    } else if (hasPrevious) {
    1.14 +                        sobj.delete(k - 1, true);
    1.15 +                    }
    1.16 +                    hasPrevious = hasCurrent;
    1.17                  }
    1.18              }
    1.19              sobj.delete(--len, true);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8025589.js	Mon Sep 30 12:06:43 2013 -0300
     2.3 @@ -0,0 +1,51 @@
     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-8025589:  Array.prototype.shift should only copy defined elements in generic mode
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var s = {length: 4, 2: 1};
    2.35 +Array.prototype.shift.call(s);
    2.36 +
    2.37 +if (s.length != 3) {
    2.38 +    fail("s.length != 3");
    2.39 +}
    2.40 +if (0 in s) {
    2.41 +    fail("0 in s");
    2.42 +}
    2.43 +if (s.hasOwnProperty(0)) {
    2.44 +    fail("s.hasOwnProperty(0)");
    2.45 +}
    2.46 +if (s[1] !== 1) {
    2.47 +    fail("s[1] !== 1");
    2.48 +}
    2.49 +if (2 in s) {
    2.50 +    fail("2 in s");
    2.51 +}
    2.52 +if (s.hasOwnProperty(2)) {
    2.53 +    fail("s.hasOwnProperty(2)");
    2.54 +}