Merge

Fri, 12 Feb 2016 19:11:54 +0000

author
robm
date
Fri, 12 Feb 2016 19:11:54 +0000
changeset 1740
6ff7a094ba60
parent 1738
8ca52d10fc0d
parent 1739
29603fdf59a8
child 1741
a136c901f3f5

Merge

     1.1 --- a/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java	Fri Feb 05 09:35:01 2016 -0800
     1.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java	Fri Feb 12 19:11:54 2016 +0000
     1.3 @@ -81,14 +81,11 @@
     1.4          }
     1.5  
     1.6          private ArrayData toRealArrayData() {
     1.7 -            return toRealArrayData(0);
     1.8 +            return new IntArrayData(0);
     1.9          }
    1.10  
    1.11          private ArrayData toRealArrayData(final int index) {
    1.12              final IntArrayData newData = new IntArrayData(index + 1);
    1.13 -            if (index == 0) {
    1.14 -                return newData;
    1.15 -            }
    1.16              return new DeletedRangeArrayFilter(newData, 0, index);
    1.17          }
    1.18  
    1.19 @@ -122,7 +119,7 @@
    1.20  
    1.21          @Override
    1.22          public ArrayData convert(final Class<?> type) {
    1.23 -            return toRealArrayData(0).convert(type);
    1.24 +            return toRealArrayData().convert(type);
    1.25          }
    1.26  
    1.27          @Override
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/nosecurity/JDK-8149334.js	Fri Feb 12 19:11:54 2016 +0000
     2.3 @@ -0,0 +1,41 @@
     2.4 +/*
     2.5 + * Copyright (c) 2016, 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-8149334: JSON.parse(JSON.stringify([])).push(10) creates an array containing two elements
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var a = JSON.parse(JSON.stringify([]))
    2.35 +print(a.length)
    2.36 +a.push(10)
    2.37 +print(a.length)
    2.38 +print(a)
    2.39 +
    2.40 +var b = JSON.parse(JSON.stringify([]))
    2.41 +print(b.length)
    2.42 +b.push('ieps')
    2.43 +print(b.length)
    2.44 +print(b)
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/nosecurity/JDK-8149334.js.EXPECTED	Fri Feb 12 19:11:54 2016 +0000
     3.3 @@ -0,0 +1,6 @@
     3.4 +0
     3.5 +1
     3.6 +10
     3.7 +0
     3.8 +1
     3.9 +ieps

mercurial