# HG changeset patch
# User jlaskey
# Date 1380553603 10800
# Node ID 0975b1d1cc352c13ddd5faf99fca817ea446da5e
# Parent  61759edb64bbf7648883a9f69ef837686ec2c39e# Parent  9f1da74085aee21f6e8d3ddd026a5f7a25eab6a3
Merge

diff -r 61759edb64bb -r 0975b1d1cc35 nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java	Mon Sep 30 10:24:42 2013 -0300
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java	Mon Sep 30 12:06:43 2013 -0300
@@ -819,8 +819,15 @@
             if (bulkable(sobj)) {
                 sobj.getArray().shiftLeft(1);
             } else {
+                boolean hasPrevious = true;
                 for (long k = 1; k < len; k++) {
-                    sobj.set(k - 1, sobj.get(k), true);
+                    boolean hasCurrent = sobj.has(k);
+                    if (hasCurrent) {
+                        sobj.set(k - 1, sobj.get(k), true);
+                    } else if (hasPrevious) {
+                        sobj.delete(k - 1, true);
+                    }
+                    hasPrevious = hasCurrent;
                 }
             }
             sobj.delete(--len, true);
diff -r 61759edb64bb -r 0975b1d1cc35 nashorn/test/script/basic/JDK-8025589.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8025589.js	Mon Sep 30 12:06:43 2013 -0300
@@ -0,0 +1,51 @@
+/*
+ * 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-8025589:  Array.prototype.shift should only copy defined elements in generic mode
+ *
+ * @test
+ * @run
+ */
+
+var s = {length: 4, 2: 1};
+Array.prototype.shift.call(s);
+
+if (s.length != 3) {
+    fail("s.length != 3");
+}
+if (0 in s) {
+    fail("0 in s");
+}
+if (s.hasOwnProperty(0)) {
+    fail("s.hasOwnProperty(0)");
+}
+if (s[1] !== 1) {
+    fail("s[1] !== 1");
+}
+if (2 in s) {
+    fail("2 in s");
+}
+if (s.hasOwnProperty(2)) {
+    fail("s.hasOwnProperty(2)");
+}