--- a/nashorn/.hgignore	Tue Jan 15 18:08:50 2013 +0100
+++ b/nashorn/.hgignore	Wed Jan 16 07:06:40 2013 -0400
@@ -22,4 +22,4 @@
 jcov2/*
 .idea/*
 test/lib/testng.jar
-test/script/external/*
\ No newline at end of file
+test/script/external/*

--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Tue Jan 15 18:08:50 2013 +0100
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Wed Jan 16 07:06:40 2013 -0400
@@ -536,10 +536,12 @@
         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);
     }

--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java	Tue Jan 15 18:08:50 2013 +0100
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java	Wed Jan 16 07:06:40 2013 -0400
@@ -50,7 +50,7 @@
 
 /**
  * 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 @@
     }
 
     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
     }
 
     /**

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8006304.js	Wed Jan 16 07:06:40 2013 -0400
@@ -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]);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8006304.js.EXPECTED	Wed Jan 16 07:06:40 2013 -0400
@@ -0,0 +1,3 @@
+w 10
+x 20
+z 40