Fixes internal compiler error caused by a null logger parsing jsni code that was generated by a generator at test time.

Change-Id: I034918d940c3318bc82ed9cb615c6f64b89fb027
Review-Link: https://gwt-review.googlesource.com/#/c/1830/

Review by: [email protected]

git-svn-id: http://google-web-toolkit.googlecode.com/svn/trunk@11491 8db76d5a-ed1c-0410-87a9-c151d255dfc7

Author: [email protected]

dev/core/src/com/google/gwt/dev/jjs/AstConstructor.java

@@ -66,8 +66,8 @@ public StandardGeneratorContext getGeneratorContext() {
 
     JProgram jprogram = new JProgram();
     JsProgram jsProgram = new JsProgram();
-    UnifyAst unifyAst = new UnifyAst(jprogram, jsProgram, options, rpo);
-    unifyAst.buildEverything(logger);
+    UnifyAst unifyAst = new UnifyAst(logger, jprogram, jsProgram, options, rpo);
+    unifyAst.buildEverything();
 
     // Compute all super type/sub type info
     jprogram.typeOracle.computeBeforeAST();

dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java

@@ -633,11 +633,11 @@ public static UnifiedAst precompile(TreeLogger logger, ModuleDef module,
 
     try {
       // (2) Assemble the Java AST.
-      UnifyAst unifyAst = new UnifyAst(jprogram, jsProgram, options, rpo);
+      UnifyAst unifyAst = new UnifyAst(logger, jprogram, jsProgram, options, rpo);
       unifyAst.addRootTypes(allRootTypes);
       // TODO: move this into UnifyAst?
       findEntryPoints(logger, rpo, declEntryPts, jprogram);
-      unifyAst.exec(logger);
+      unifyAst.exec();
 
       List<String> finalTypeOracleTypes = Lists.create();
       if (precompilationMetrics != null) {

dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java

@@ -498,7 +498,7 @@ private JExpression handleMagicMethodCall(JMethodCall x) {
    */
   private final Set<JNode> liveFieldsAndMethods = new IdentityHashSet<JNode>();
 
-  private TreeLogger logger;
+  private final TreeLogger logger;
   private Set<JMethod> magicMethodCalls = new IdentityHashSet<JMethod>();
   private final Map<String, JMethod> methodMap = new HashMap<String, JMethod>();
   private final JJSOptions options;
@@ -515,8 +515,9 @@ private JExpression handleMagicMethodCall(JMethodCall x) {
   private final Map<String, List<JMethod>> virtualMethodsPending =
       new java.util.HashMap<String, List<JMethod>>();
 
-  public UnifyAst(JProgram program, JsProgram jsProgram, JJSOptions options,
+  public UnifyAst(TreeLogger logger, JProgram program, JsProgram jsProgram, JJSOptions options,
       RebindPermutationOracle rpo) {
+    this.logger = logger;
     this.program = program;
     this.jsProgram = jsProgram;
     this.options = options;
@@ -538,8 +539,7 @@ public void addRootTypes(Collection<String> sourceTypeNames) throws UnableToComp
    * Special AST construction, useful for tests. Everything is resolved,
    * translated, and unified.
    */
-  public void buildEverything(TreeLogger logger) throws UnableToCompleteException {
-    this.logger = logger;
+  public void buildEverything() throws UnableToCompleteException {
     for (String internalName : classFileMap.keySet()) {
       String typeName = InternalName.toBinaryName(internalName);
       searchForTypeByBinary(typeName);
@@ -568,9 +568,7 @@ public void buildEverything(TreeLogger logger) throws UnableToCompleteException
    * entry points. This reduces memory and improves compile speed. Any
    * unreachable elements are pruned.
    */
-  public void exec(TreeLogger logger) throws UnableToCompleteException {
-    this.logger = logger;
-
+  public void exec() throws UnableToCompleteException {
     // Trace execution from entry points.
     for (JMethod entryMethod : program.getEntryMethods()) {
       flowInto(entryMethod);