Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8044816: On-demand compiled top-level program doesn't need :createProgramFunction
authorattila
Thu, 05 Jun 2014 12:16:09 +0200
changeset 24784 ed11bdcc878a
parent 24783 b5c31bfe1496
child 24785 681b70d49d8d
8044816: On-demand compiled top-level program doesn't need :createProgramFunction Reviewed-by: jlaskey, lagergren, sundar
nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java file | annotate | diff | comparison | revisions 
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Thu Jun 05 12:15:45 2014 +0200
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Thu Jun 05 12:16:09 2014 +0200
@@ -4312,8 +4312,7 @@
 
         assert data != null : functionNode.getName() + " has no data";
 
-        final FunctionNode parentFn = lc.getParentFunction(functionNode);
-        if (parentFn == null && functionNode.isProgram()) {
+        if (functionNode.isProgram() && !compiler.isOnDemandCompilation()) {
             final CompileUnit fnUnit = functionNode.getCompileUnit();
             final MethodEmitter createFunction = fnUnit.getClassEmitter().method(
                     EnumSet.of(Flag.PUBLIC, Flag.STATIC), CREATE_PROGRAM_FUNCTION.symbolName(),
jdk-sandbox