Updated patch, fixes a failing test.  I think this is G2G now.


http://gwt-code-reviews.appspot.com/1455801/diff/4002/dev/core/src/com/google/gwt/dev/jjs/impl/SourceInfoCorrelator.java
File dev/core/src/com/google/gwt/dev/jjs/impl/SourceInfoCorrelator.java
(right):

http://gwt-code-reviews.appspot.com/1455801/diff/4002/dev/core/src/com/google/gwt/dev/jjs/impl/SourceInfoCorrelator.java#newcode157
dev/core/src/com/google/gwt/dev/jjs/impl/SourceInfoCorrelator.java:157:
assert program.getSourceInfo() instanceof SourceInfoCorrelation;
This was a holdover from a previous, different implementation that
involved hacky deserialization tricks.

http://gwt-code-reviews.appspot.com/1455801/diff/3025/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java
File dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java (right):

http://gwt-code-reviews.appspot.com/1455801/diff/3025/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java#newcode825
dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java:825:
sourceInfo.addCorrelation(sourceInfo.getCorrelator().by(Literal.STRING));
Under GwtAstBuilder, correlator never gets setup, but that's ok since
it's going away real soon now.

http://gwt-code-reviews.appspot.com/1455801/diff/3025/dev/core/test/com/google/gwt/dev/SoycTest.java
File dev/core/test/com/google/gwt/dev/SoycTest.java (right):

http://gwt-code-reviews.appspot.com/1455801/diff/3025/dev/core/test/com/google/gwt/dev/SoycTest.java#newcode33
dev/core/test/com/google/gwt/dev/SoycTest.java:33: public class SoycTest
extends TestCase {
Changes to this file not strictly required to land this, but I ran into
issues debugging this failing test.

http://gwt-code-reviews.appspot.com/1455801/diff/3025/dev/core/test/com/google/gwt/dev/SoycTest.java#newcode38
dev/core/test/com/google/gwt/dev/SoycTest.java:38: File work =
Utility.makeTemporaryDirectory(null, "hellowork");
Gave war/extra a common ancestor, otherwise gwt-unitCache ends up being
a direct child of $TMP... and therefore shared across multiple runs.

http://gwt-code-reviews.appspot.com/1455801/diff/3025/dev/core/test/com/google/gwt/dev/SoycTest.java#newcode56
dev/core/test/com/google/gwt/dev/SoycTest.java:56:
Util.recursiveDelete(work, false);
Moved to finally block so failing test doesn't leave stuff around.

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

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to