No cache

dev/build.xml

@@ -276,6 +276,7 @@
   <target name="checkstyle" description="Static analysis of source">
     <gwt.checkstyle>
       <fileset dir="core/src">
+        <filename name="com/google/gwt/dev/jjs/impl/jribble/JribbleProtos.java" negate="yes" />
         <filename name="com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java" negate="yes" />
         <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes" />
         <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes" />

dev/core/src/com/google/gwt/dev/javac/CachedCompilationUnit.java

@@ -15,6 +15,7 @@
  */
 package com.google.gwt.dev.javac;
 
+import com.google.gwt.dev.jjs.ast.JDeclaredType;
 import com.google.gwt.dev.jjs.impl.GwtAstBuilder;
 import com.google.gwt.dev.util.DiskCacheToken;
 
@@ -151,8 +152,8 @@ public String getTypeName() {
   }
 
   @Override
-  public byte[] getTypesSerialized() {
-    return astToken.readByteArray();
+  public List<JDeclaredType> getTypes() {
+    return getTypesFromSerialized(astToken.readByteArray());
   }
 
   @Override

dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java

@@ -21,7 +21,6 @@
 import com.google.gwt.dev.jjs.CorrelationFactory.DummyCorrelationFactory;
 import com.google.gwt.dev.jjs.ast.JDeclaredType;
 import com.google.gwt.dev.jjs.impl.GwtAstBuilder;
-import com.google.gwt.dev.jjs.impl.jribble.JribbleLoader;
 import com.google.gwt.dev.js.ast.JsRootScope;
 import com.google.gwt.dev.resource.Resource;
 import com.google.gwt.dev.util.StringInterner;
@@ -238,10 +237,13 @@ public void run() {
         buildThread.start();
 
         ArrayList<CompilationUnitBuilder> javaBuilders = new ArrayList<CompilationUnitBuilder>();
-        ArrayList<CompilationUnitBuilder> jribbleBuilders = new ArrayList<CompilationUnitBuilder>();
         for (CompilationUnitBuilder builder : builders) {
           if (builder.isJribble()) {
-            jribbleBuilders.add(builder);
+            /*
+             * No Java compilation is necessary for Jribble, so start building
+             * them immediately.
+             */
+            buildQueue.add(builder);
           } else {
             javaBuilders.add(builder);
           }
@@ -250,10 +252,6 @@ public void run() {
         Event jdtCompilerEvent = SpeedTracerLogger.start(eventType);
         try {
           compiler.doCompile(javaBuilders);
-
-          JribbleLoader jribbleLoader = new JribbleLoader(Thread
-              .currentThread().getContextClassLoader(), buildQueue);
-          jribbleLoader.load(jribbleBuilders);
         } finally {
           jdtCompilerEvent.end();
         }

dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java

@@ -212,7 +212,8 @@ public static boolean isClassnameGenerated(String className) {
 
   /**
    * Returns the unit as an instance of {@link CachedCompilationUnit}, making a
-   * copy if necessary.
+   * copy if necessary. Returns <code>null</code> if the unit should not be
+   * cached.
    */
   public abstract CachedCompilationUnit asCachedCompilationUnit();
 
@@ -302,7 +303,7 @@ public final Map<String, String> getAnonymousClassMap() {
    * Returns the full abstract path of the resource. If a resource has been
    * re-rooted, this path should include any path prefix that was stripped.
    * 
-   * @see com.google.gwt.dev.resource.Resource#getPath() 
+   * @see com.google.gwt.dev.resource.Resource#getPath()
    * @see com.google.gwt.dev.resource.Resource#getPathPrefix()
    */
   public abstract String getResourcePath();
@@ -315,23 +316,7 @@ public final Map<String, String> getAnonymousClassMap() {
   /**
    * Returns the GWT AST types in this unit.
    */
-  public List<JDeclaredType> getTypes() {
-    try {
-      byte[] bytes = getTypesSerialized();
-      ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes));
-      return JProgram.deserializeTypes(ois);
-    } catch (IOException e) {
-      throw new RuntimeException("Unexpected IOException on in-memory stream", e);
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException("Unexpected error deserializing AST for '" + getTypeName() + "'",
-          e);
-    }
-  }
-
-  /**
-   * Returns the GWT AST types in this unit in serialized form.
-   */
-  public abstract byte[] getTypesSerialized();
+  public abstract List<JDeclaredType> getTypes();
 
   @Deprecated
   public final boolean hasAnonymousClasses() {
@@ -370,6 +355,13 @@ public final int hashCode() {
   @Deprecated
   public abstract boolean isSuperSource();
 
+  /**
+   * Whether this unit should be persisted to disk.
+   */
+  public boolean shouldBePersisted() {
+    return true;
+  }
+
   /**
    * Overridden to finalize; always returns {@link #getResourceLocation()}.
    */
@@ -383,7 +375,9 @@ public final String toString() {
    * {@link CachedCompilationUnit}.
    */
   protected final Object writeReplace() {
-    return asCachedCompilationUnit();
+    CachedCompilationUnit cachedUnit = asCachedCompilationUnit();
+    assert cachedUnit != null;
+    return cachedUnit;
   }
 
   /**
@@ -398,6 +392,22 @@ protected final Object writeReplace() {
 
   abstract CategorizedProblem[] getProblems();
 
+  /**
+   * Read types from a serialized byte array. This is a helper method for
+   * subclasses that persist their types by serializing the GWT representations.
+   */
+  List<JDeclaredType> getTypesFromSerialized(byte[] serialized) {
+    try {
+      ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(serialized));
+      return JProgram.deserializeTypes(ois);
+    } catch (IOException e) {
+      throw new RuntimeException("Unexpected IOException on in-memory stream", e);
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException("Unexpected error deserializing AST for '" + getTypeName() + "'",
+          e);
+    }
+  }
+
   private List<String> getJdtClassNames(String topLevelClass) {
     List<String> classNames = new ArrayList<String>();
     for (CompiledClass cc : getCompiledClasses()) {
@@ -412,7 +422,7 @@ private List<String> getJdtClassNames(String topLevelClass) {
   private List<String> getTopLevelClasses() {
     List<String> topLevelClasses = new ArrayList<String>();
     for (CompiledClass cc : getCompiledClasses()) {
-      if (cc.getEnclosingClass() == null) {
+      if (cc.isTopLevel()) {
         topLevelClasses.add(cc.getInternalName());
       }
     }