Roberto Lublinerman has uploaded a new change for review.

  https://gwt-review.googlesource.com/1830


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

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

Change-Id: I034918d940c3318bc82ed9cb615c6f64b89fb027
---
M dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
M dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
2 files changed, 4 insertions(+), 2 deletions(-)



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 042e145..36102d2 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -618,7 +618,7 @@
     try {
       // (2) Assemble the Java AST.
       UnifyAst unifyAst = new UnifyAst(jprogram, jsProgram, options, rpo);
-      unifyAst.addRootTypes(allRootTypes);
+      unifyAst.addRootTypes(logger, allRootTypes);
       // TODO: move this into UnifyAst?
       findEntryPoints(logger, rpo, declEntryPts, jprogram);
       unifyAst.exec(logger);
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java b/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
index a7aa3a9..ed7e38a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
@@ -525,7 +525,9 @@
this.classFileMapBySource = rpo.getCompilationState().getClassFileMapBySource();
   }

- public void addRootTypes(Collection<String> sourceTypeNames) throws UnableToCompleteException { + public void addRootTypes(TreeLogger logger, Collection<String> sourceTypeNames)
+      throws UnableToCompleteException {
+    this.logger = logger;
     for (String sourceTypeName : sourceTypeNames) {
       searchForTypeBySource(sourceTypeName);
     }

--
To view, visit https://gwt-review.googlesource.com/1830
To unsubscribe, visit https://gwt-review.googlesource.com/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I034918d940c3318bc82ed9cb615c6f64b89fb027
Gerrit-PatchSet: 1
Gerrit-Project: gwt
Gerrit-Branch: master
Gerrit-Owner: Roberto Lublinerman <[email protected]>

--
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
--- You received this message because you are subscribed to the Google Groups "Google Web Toolkit Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to