[gwt-contrib] Implement EntryMethodHolder.init in source. (issue1421803)

Tue, 19 Apr 2011 13:12:44 -0700 

Reviewers: jbrosenberg,

Message:
Stub out EntryMethodHolder.init() so we can use the existing empty
method instead of having to create it from whole cloth.



Please review this at http://gwt-code-reviews.appspot.com/1421803/

Affected files:
  M dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
M dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/EntryMethodHolder.java 


Index: dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java index 0c19f948edafa63347451e03a1ab2e8873fee589..ec645831f068e91b9d88d74f025950adf2ba3cd0 100644 
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -872,7 +872,7 @@ public class JavaToJavaScriptCompiler {
     return dependencyRecorder;
   }

-  private static JMethodCall createReboundModuleLoad(TreeLogger logger,
+ private static JMethodCall createReboundModuleLoad(TreeLogger logger, SourceInfo info, JDeclaredType reboundEntryType, String originalMainClassName, JDeclaredType enclosingType) 
       throws UnableToCompleteException {
     if (!(reboundEntryType instanceof JClassType)) {
@@ -902,10 +902,9 @@ public class JavaToJavaScriptCompiler {
       throw new UnableToCompleteException();
     }

-    SourceInfo sourceInfo = entryClass.getSourceInfo();
     JExpression qualifier = null;
     if (!entryMethod.isStatic()) {
- qualifier = JGwtCreate.createInstantiationExpression(sourceInfo, entryClass, enclosingType); + qualifier = JGwtCreate.createInstantiationExpression(info, entryClass, enclosingType); 

       if (qualifier == null) {
         logger.log(TreeLogger.ERROR,
@@ -915,21 +914,17 @@ public class JavaToJavaScriptCompiler {
         throw new UnableToCompleteException();
       }
     }
-    return new JMethodCall(sourceInfo, qualifier, entryMethod);
+    return new JMethodCall(info, qualifier, entryMethod);
   }
private static void findEntryPoints(TreeLogger logger, RebindPermutationOracle rpo, String[] mainClassNames, JProgram program) throws UnableToCompleteException { Event findEntryPointsEvent = SpeedTracerLogger.start(CompilerEventType.FIND_ENTRY_POINTS); - SourceInfo sourceInfo = program.createSourceInfoSynthetic(JavaToJavaScriptCompiler.class); 
-    JMethod bootStrapMethod =
- program.createMethod(sourceInfo, "init", program.getIndexedType("EntryMethodHolder"), 
-            program.getTypeVoid(), false, true, true, false, false);
-    bootStrapMethod.freezeParamTypes();
-    bootStrapMethod.setSynthetic();
+ JMethod bootStrapMethod = program.getIndexedMethod("EntryMethodHolder.init"); 

     JMethodBody body = (JMethodBody) bootStrapMethod.getBody();
     JBlock block = body.getBlock();
+    SourceInfo info = block.getSourceInfo().makeChild();

     // Also remember $entry, which we'll handle specially in GenerateJsAst
     JMethod registerEntry = program.getIndexedMethod("Impl.registerEntry");
@@ -947,7 +942,7 @@ public class JavaToJavaScriptCompiler {

       JMethod mainMethod = findMainMethod(mainType);
       if (mainMethod != null && mainMethod.isStatic()) {
- JMethodCall onModuleLoadCall = new JMethodCall(null, null, mainMethod); + JMethodCall onModuleLoadCall = new JMethodCall(info, null, mainMethod); 
         block.addStmt(onModuleLoadCall.makeStatement());
         continue;
       }
@@ -965,7 +960,7 @@ public class JavaToJavaScriptCompiler {
         }

         JMethodCall onModuleLoadCall =
- createReboundModuleLoad(logger, resultType, mainClassName, bootStrapMethod + createReboundModuleLoad(logger, info, resultType, mainClassName, bootStrapMethod 
                 .getEnclosingType());
         resultTypes.add((JClassType) resultType);
         entryCalls.add(onModuleLoadCall);
@@ -974,7 +969,7 @@ public class JavaToJavaScriptCompiler {
         block.addStmt(entryCalls.get(0).makeStatement());
       } else {
         JReboundEntryPoint reboundEntryPoint =
- new JReboundEntryPoint(mainType.getSourceInfo(), mainType, resultTypes, entryCalls); + new JReboundEntryPoint(info, mainType, resultTypes, entryCalls); 
         block.addStmt(reboundEntryPoint);
       }
     }
Index: dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/EntryMethodHolder.java diff --git a/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/EntryMethodHolder.java b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/EntryMethodHolder.java index 8464c59912cebcbc1aa83e05a464f9caa173caa0..5c1c860cb68b7e13a9263b81c794f0844589274d 100644 --- a/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/EntryMethodHolder.java +++ b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/EntryMethodHolder.java 
@@ -19,5 +19,7 @@ package com.google.gwt.lang;
* This class holds the boot strap entry method that the compiler generates. 
  */
 public class EntryMethodHolder {
-
+  public static final void init() {
+    // Filled in compiler to call entry methods.
+  }
 }


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to