Mercurial > hg > openjdk > aarch64-port > nashorn
changeset 1151:ec1fd6967009
8067219: NPE in ScriptObject.clone() when running with object fields
Reviewed-by: attila, lagergren
author | hannesw |
---|---|
date | Thu, 11 Dec 2014 19:32:45 +0100 |
parents | 0a5ec176e9d8 |
children | 6ec61d249428 |
files | src/jdk/nashorn/internal/codegen/CodeGenerator.java src/jdk/nashorn/internal/runtime/ScriptObject.java test/script/basic/es6/for-let-object-fields.js test/script/basic/es6/for-let-object-fields.js.EXPECTED test/script/basic/es6/for-let.js |
diffstat | 5 files changed, 120 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Dec 11 17:46:50 2014 +0100 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Dec 11 19:32:45 2014 +0100 @@ -3282,7 +3282,7 @@ emitContinueLabel(continueLabel, liveLocalsOnContinue); } - if (loopNode.hasPerIterationScope() && lc.getParentBlock().needsScope()) { + if (loopNode.hasPerIterationScope() && lc.getCurrentBlock().needsScope()) { // ES6 for loops with LET init need a new scope for each iteration. We just create a shallow copy here. method.loadCompilerConstant(SCOPE); method.invoke(virtualCallNoLookup(ScriptObject.class, "copy", ScriptObject.class));
--- a/src/jdk/nashorn/internal/runtime/ScriptObject.java Thu Dec 11 17:46:50 2014 +0100 +++ b/src/jdk/nashorn/internal/runtime/ScriptObject.java Thu Dec 11 19:32:45 2014 +0100 @@ -3710,7 +3710,9 @@ final ScriptObject clone = (ScriptObject) super.clone(); if (objectSpill != null) { clone.objectSpill = objectSpill.clone(); - clone.primitiveSpill = primitiveSpill.clone(); + if (primitiveSpill != null) { + clone.primitiveSpill = primitiveSpill.clone(); + } } clone.arrayData = arrayData.copy(); return clone;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/es6/for-let-object-fields.js Thu Dec 11 19:32:45 2014 +0100 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2010, 2014, 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-8067219: NPE in ScriptObject.clone() when running with object fields + * + * @test + * @run + * @fork + * @option -Dnashorn.fields.objects=true + * @option --language=es6 + */ + +"use strict"; + +for (let i = 0; i < 10; i++) { + print(i); +} + +try { + print(i); +} catch (e) { + print(e); +} + +let a = []; + +for (let i = 0; i < 10; i++) { + a.push(function() { print(i); }); +} + +a.forEach(function(f) { f(); }); + +a = []; + +for (let i = 0; i < 10; i++) { + if (i == 5) { + i = "foo"; + } + a.push(function() { print(i); }); +} + +a.forEach(function(f) { f(); }); + +try { + print(i); +} catch (e) { + print(e); +} + +a = []; + +for (let i = 0; i < 20; i++) { + if (i % 2 == 1) { + i += 2; + continue; + } + a.push(function() { print(i); }); +} + +a.forEach(function(f) { f(); });
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/es6/for-let-object-fields.js.EXPECTED Thu Dec 11 19:32:45 2014 +0100 @@ -0,0 +1,33 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +ReferenceError: "i" is not defined +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +0 +1 +2 +3 +4 +foo +ReferenceError: "i" is not defined +0 +4 +8 +12 +16