Have ControlFlowAnalyzer record fields that are written. Previously,
it only recorded fields that were read. This allows fixing a bug
in CodeSplitter where a field could end up being written before the
field itself was loaded.
Also, this adds a test case for runAsync.
Review by: kprobst
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4358 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java b/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java
index f5014cb..a44816d 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/CodeSplitter.java
@@ -254,6 +254,13 @@
return (value == null) ? 0 : value;
}
+ private static <T> Set<T> union(Set<? extends T> set1, Set<? extends T> set2) {
+ Set<T> union = new HashSet<T>();
+ union.addAll(set1);
+ union.addAll(set2);
+ return union;
+ }
+
private static <T> void updateMap(int entry, Map<T, Integer> map,
Set<?> liveWithoutEntry, Iterable<T> all) {
for (T each : all) {
@@ -577,11 +584,13 @@
allMethods.add((JMethod) node);
}
}
+ allFields.addAll(everything.getFieldsWritten());
for (int entry = 1; entry < numEntries; entry++) {
ControlFlowAnalyzer allButOne = allButOnes.get(entry - 1);
- updateMap(entry, fragmentMap.fields, allButOne.getLiveFieldsAndMethods(),
- allFields);
+ Set<JNode> allLiveNodes = union(allButOne.getLiveFieldsAndMethods(),
+ allButOne.getFieldsWritten());
+ updateMap(entry, fragmentMap.fields, allLiveNodes, allFields);
updateMap(entry, fragmentMap.methods,
allButOne.getLiveFieldsAndMethods(), allMethods);
updateMap(entry, fragmentMap.strings, allButOne.getLiveStrings(),
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
index a7eee8f..bcac220 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
@@ -107,6 +107,10 @@
@Override
public boolean visit(JBinaryOperation x, Context ctx) {
+ if (x.isAssignment() && x.getLhs() instanceof JFieldRef) {
+ fieldsWritten.add(((JFieldRef) x.getLhs()).getField());
+ }
+
// special string concat handling
if ((x.getOp() == JBinaryOperator.ADD || x.getOp() == JBinaryOperator.ASG_ADD)
&& x.getType() == program.getTypeJavaLangString()) {
@@ -211,6 +215,10 @@
* the variable is accessed, not when its declaration runs.
*/
accept(x.getInitializer());
+
+ if (x.getVariableRef().getTarget() instanceof JField) {
+ fieldsWritten.add((JField) x.getVariableRef().getTarget());
+ }
}
}
@@ -618,6 +626,7 @@
}
}
+ private Set<JField> fieldsWritten = new HashSet<JField>();
private Set<JReferenceType> instantiatedTypes = new HashSet<JReferenceType>();
private Set<JNode> liveFieldsAndMethods = new HashSet<JNode>();
private Set<String> liveStrings = new HashSet<String>();
@@ -643,6 +652,7 @@
public ControlFlowAnalyzer(ControlFlowAnalyzer cfa) {
program = cfa.program;
+ fieldsWritten = new HashSet<JField>(cfa.fieldsWritten);
instantiatedTypes = new HashSet<JReferenceType>(cfa.instantiatedTypes);
liveFieldsAndMethods = new HashSet<JNode>(cfa.liveFieldsAndMethods);
referencedTypes = new HashSet<JReferenceType>(cfa.referencedTypes);
@@ -659,6 +669,13 @@
}
/**
+ * Return the set of all fields that are written.
+ */
+ public Set<JField> getFieldsWritten() {
+ return fieldsWritten;
+ }
+
+ /**
* Return the complete set of types that have been instantiated.
*/
public Set<JReferenceType> getInstantiatedTypes() {
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentExtractor.java b/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentExtractor.java
index a3c49a4..7e33287 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentExtractor.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentExtractor.java
@@ -57,7 +57,8 @@
}
public boolean isLive(JField field) {
- return cfa.getLiveFieldsAndMethods().contains(field);
+ return cfa.getLiveFieldsAndMethods().contains(field)
+ || cfa.getFieldsWritten().contains(field);
}
public boolean isLive(JMethod method) {
diff --git a/user/test/com/google/gwt/dev/jjs/CompilerSuite.java b/user/test/com/google/gwt/dev/jjs/CompilerSuite.java
index b079d19..fea18ff 100644
--- a/user/test/com/google/gwt/dev/jjs/CompilerSuite.java
+++ b/user/test/com/google/gwt/dev/jjs/CompilerSuite.java
@@ -39,6 +39,7 @@
import com.google.gwt.dev.jjs.test.MiscellaneousTest;
import com.google.gwt.dev.jjs.test.NativeLongTest;
import com.google.gwt.dev.jjs.test.ObjectIdentityTest;
+import com.google.gwt.dev.jjs.test.RunAsyncTest;
import com.google.gwt.dev.jjs.test.UnstableGeneratorTest;
import com.google.gwt.dev.jjs.test.VarargsTest;
import com.google.gwt.junit.tools.GWTTestSuite;
@@ -78,6 +79,7 @@
suite.addTestSuite(MiscellaneousTest.class);
suite.addTestSuite(NativeLongTest.class);
suite.addTestSuite(ObjectIdentityTest.class);
+ suite.addTestSuite(RunAsyncTest.class);
suite.addTestSuite(UnstableGeneratorTest.class);
suite.addTestSuite(VarargsTest.class);
// $JUnit-END$
diff --git a/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java b/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
new file mode 100644
index 0000000..8039a5b
--- /dev/null
+++ b/user/test/com/google/gwt/dev/jjs/test/RunAsyncTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.jjs.test;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.RunAsyncCallback;
+import com.google.gwt.junit.client.GWTTestCase;
+import com.google.gwt.user.client.Window;
+
+/**
+ * Tests runAsync in various ways.
+ */
+public class RunAsyncTest extends GWTTestCase {
+ private static final int RUNASYNC_TIMEOUT = 10000;
+
+ @Override
+ public String getModuleName() {
+ return "com.google.gwt.dev.jjs.CompilerSuite";
+ }
+
+ private static final String HELLO = "hello";
+
+ private static String staticWrittenInBaseButReadLater;
+
+ public void testBasic() {
+ delayTestFinish(RUNASYNC_TIMEOUT);
+
+ GWT.runAsync(new RunAsyncCallback() {
+ public void onFailure(Throwable caught) {
+ throw new RuntimeException(caught);
+ }
+
+ public void onSuccess() {
+ finishTest();
+ }
+ });
+ }
+
+ /**
+ * Unlike with pruning, writing to a field should rescue it for code-splitting
+ * purposes.
+ */
+ public void testFieldWrittenButNotRead() {
+ delayTestFinish(RUNASYNC_TIMEOUT);
+
+ // This write happens in the base fragment
+ staticWrittenInBaseButReadLater = HELLO;
+
+ GWT.runAsync(new RunAsyncCallback() {
+ public void onFailure(Throwable caught) {
+ throw new RuntimeException(caught);
+ }
+
+ public void onSuccess() {
+ // This read happens later
+ assertEquals(HELLO, staticWrittenInBaseButReadLater);
+ finishTest();
+ }
+ });
+ }
+
+}
