8006304: Remove pre-population of maps for constructor produced maps

Reviewed-by: sundar
This commit is contained in:
James Laskey 2013-01-16 07:06:40 -04:00 committed by Jim Laskey
parent a2efb1b4f5
commit c6c424f27a
5 changed files with 49 additions and 3 deletions
nashorn

@ -22,4 +22,4 @@ CC/*
jcov2/*
.idea/*
test/lib/testng.jar
test/script/external/*
test/script/external/*

@ -536,10 +536,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
final List<String> keys = new ArrayList<>();
final List<Symbol> symbols = new ArrayList<>();
/* TODO - Predefine known properties.
for (final Entry<String, Node> entry : thisProperties.entrySet()) {
keys.add(entry.getKey());
symbols.add(entry.getValue().getSymbol());
}
*/
new FunctionObjectCreator(this, functionNode, keys, symbols).makeObject(method);
}

@ -50,7 +50,7 @@ import jdk.nashorn.internal.runtime.Source;
/**
* Analyze a function object's characteristics for appropriate code
* generation. This generates code for the instantiation of ScriptFunction:s
* generation. This generates code for the instantiation of ScriptFunctions.
*/
public class FunctionObjectCreator extends ObjectCreator {
@ -70,7 +70,7 @@ public class FunctionObjectCreator extends ObjectCreator {
}
private void loadHandle(final MethodEmitter method, final String signature) {
method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
}
/**

@ -0,0 +1,41 @@
/*
* 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-8006304 : Remove pre-population of maps for constructor produced maps.
*
* @test
* @run
*/
function Factory() {
this.w = 10;
this.x = 20;
if (false) {
this.y = 30;
}
this.z = 40;
}
var a = new Factory();
for (var i in a) print(i, a[i]);

@ -0,0 +1,3 @@
w 10
x 20
z 40