commit b478522993903b10d8edbc4ab2dcb4df368bc8dc
author Roberto Lublinerman <rluble@google.com> Fri Oct 09 18:58:48 2015 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 10 02:10:31 2015 +0000
tree 2aeda3424fe5932ccec780388f90df573e23d6c9
parent d6314fc3e206f7993e57d0d87c6f65cc2e494360

Move NameClashesFixer back to the start of GenerateJavaScriptAST.exec.

Moving it to normalizeSemantics introduced an unwanted behaviour.

Change-Id: Id071b2c8d1a543a257e6cc5cdc3f0f1da83e3682

dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java

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 beffcdf..98f61bf 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -97,7 +97,6 @@
 import com.google.gwt.dev.jjs.impl.MethodCallSpecializer;
 import com.google.gwt.dev.jjs.impl.MethodCallTightener;
 import com.google.gwt.dev.jjs.impl.MethodInliner;
-import com.google.gwt.dev.jjs.impl.NameClashesFixer;
 import com.google.gwt.dev.jjs.impl.OptimizerContext;
 import com.google.gwt.dev.jjs.impl.OptimizerStats;
 import com.google.gwt.dev.jjs.impl.PostOptimizationCompoundAssignmentNormalizer;
@@ -505,7 +504,6 @@
       TypeMapper<?> typeMapper = getTypeMapper();
       ResolveRuntimeTypeReferences.exec(jprogram, typeMapper, getTypeOrder());
 
-      NameClashesFixer.exec(jprogram);
       return typeMapper;
     } finally {
       event.end();

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

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
index 785daaa..4d5d5ff 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
@@ -3002,6 +3002,7 @@
   }
 
   private Pair<JavaToJavaScriptMap, Set<JsNode>> execImpl() {
+    NameClashesFixer.exec(program);
     uninitializedValuePotentiallyObservable = optimize
         ? ComputePotentiallyObservableUninitializedValues.analyze(program)
         : Predicates.<JField>alwaysTrue();

dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java

diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
index e52b521..3246258 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
@@ -98,7 +98,6 @@
     ArrayNormalizer.exec(jProgram);
     TypeTightener.exec(jProgram);
     MethodCallTightener.exec(jProgram);
-    NameClashesFixer.exec(jProgram);
 
     IntTypeMapper typeMapper = new IntTypeMapper();
     ResolveRuntimeTypeReferences.exec(jProgram, typeMapper, TypeOrder.FREQUENCY);