commit 341a52b2225a0add3b217c55b6e0853e0b182bf3
author scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Jun 14 16:03:43 2011 +0000
committer scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Jun 14 16:03:43 2011 +0000
tree 5a112801654adf0e673812122ba6b08831c303ba
parent 0798435325ebc9033783ce03e83e43e15ed3df88

Resolve GWT.create() answers by source name.

http://gwt-code-reviews.appspot.com/1450818


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

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

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 fff563d..f1a4246 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
@@ -360,7 +360,7 @@
 
       ArrayList<JExpression> instantiationExpressions = new ArrayList<JExpression>(answers.size());
       for (String answer : answers) {
-        JDeclaredType answerType = searchForType(answer);
+        JDeclaredType answerType = searchForTypeBySource(answer);
         if (answerType == null) {
           error(x, "Rebind result '" + answer + "' could not be found");
           return null;
@@ -405,7 +405,7 @@
       JsniRef ref = JsniRef.parse(stringValue);
       if (ref != null) {
         if (Name.isBinaryName(ref.className())) {
-          searchForType(ref.className());
+          searchForTypeByBinary(ref.className());
         }
         node = JsniRefLookup.findJsniRefTarget(ref, program, new JsniRefLookup.ErrorReporter() {
           public void reportError(String errMsg) {
@@ -415,7 +415,7 @@
       } else {
         // See if it's just @foo.Bar, which would result in the class seed
         String typeName = stringValue.charAt(0) == '@' ? stringValue.substring(1) : stringValue;
-        node = searchForType(typeName);
+        node = searchForTypeByBinary(typeName);
       }
       if (node == null) {
         // Not found, must be null
@@ -469,6 +469,7 @@
       CLASS_IS_CLASS_METADATA_ENABLED));
 
   private final Map<String, CompiledClass> classFileMap;
+  private final Map<String, CompiledClass> classFileMapBySource;
   private boolean errorsFound = false;
   private final Set<CompilationUnit> failedUnits = new IdentityHashSet<CompilationUnit>();
   private final Map<String, JField> fieldMap = new HashMap<String, JField>();
@@ -511,23 +512,12 @@
     this.options = options;
     this.rpo = rpo;
     this.classFileMap = rpo.getCompilationState().getClassFileMap();
+    this.classFileMapBySource = rpo.getCompilationState().getClassFileMapBySource();
   }
 
   public void addRootTypes(Collection<String> sourceTypeNames) {
-    Map<String, CompiledClass> classFileMapBySource =
-        rpo.getCompilationState().getClassFileMapBySource();
     for (String sourceTypeName : sourceTypeNames) {
-      JDeclaredType type = program.getFromTypeMap(sourceTypeName);
-      if (type == null) {
-        CompiledClass cc = classFileMapBySource.get(sourceTypeName);
-        if (cc == null) {
-          // TODO: error
-          throw new NoClassDefFoundError(sourceTypeName);
-        }
-        assimilateUnit(cc.getUnit());
-        type = program.getFromTypeMap(sourceTypeName);
-        assert type != null || errorsFound;
-      }
+      searchForTypeBySource(sourceTypeName);
     }
   }
 
@@ -539,7 +529,7 @@
     this.logger = logger;
     for (String internalName : classFileMap.keySet()) {
       String typeName = InternalName.toBinaryName(internalName);
-      searchForType(typeName);
+      searchForTypeByBinary(typeName);
     }
 
     for (JDeclaredType type : program.getDeclaredTypes()) {
@@ -939,7 +929,7 @@
     type.resolve(resolvedInterfaces, resolvedRescues);
   }
 
-  private JDeclaredType searchForType(String binaryTypeName) {
+  private JDeclaredType searchForTypeByBinary(String binaryTypeName) {
     JDeclaredType type = program.getFromTypeMap(binaryTypeName);
     if (type == null) {
       CompiledClass cc = classFileMap.get(BinaryName.toInternalName(binaryTypeName));
@@ -954,6 +944,21 @@
     return type;
   }
 
+  private JDeclaredType searchForTypeBySource(String sourceTypeName) {
+    JDeclaredType type = program.getFromTypeMap(sourceTypeName);
+    if (type == null) {
+      CompiledClass cc = classFileMapBySource.get(sourceTypeName);
+      if (cc == null) {
+        // TODO: error
+        throw new NoClassDefFoundError(sourceTypeName);
+      }
+      assimilateUnit(cc.getUnit());
+      type = program.getFromTypeMap(sourceTypeName);
+      assert type != null || errorsFound;
+    }
+    return type;
+  }
+
   private void staticInitialize(JDeclaredType type) {
     if (type.isExternal()) {
       assert errorsFound;
@@ -995,7 +1000,7 @@
     }
 
     String typeName = type.getName();
-    JDeclaredType newType = searchForType(typeName);
+    JDeclaredType newType = searchForTypeByBinary(typeName);
     if (newType == null) {
       assert errorsFound;
       return type;