From b478522993903b10d8edbc4ab2dcb4df368bc8dc Mon Sep 17 00:00:00 2001
From: Roberto Lublinerman <rluble@google.com>
Date: Fri, 9 Oct 2015 18:58:48 -0700
Subject: [PATCH] Move NameClashesFixer back to the start of
 GenerateJavaScriptAST.exec.

Moving it to normalizeSemantics introduced an unwanted behaviour.

Change-Id: Id071b2c8d1a543a257e6cc5cdc3f0f1da83e3682
---
 .../src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java    | 2 --
 .../src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java  | 1 +
 .../test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

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 beffcdfd4e5..98f61bfb61e 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 @@ protected TypeMapper<?> normalizeSemantics() {
       TypeMapper<?> typeMapper = getTypeMapper();
       ResolveRuntimeTypeReferences.exec(jprogram, typeMapper, getTypeOrder());
 
-      NameClashesFixer.exec(jprogram);
       return typeMapper;
     } finally {
       event.end();
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 785daaa38b2..4d5d5ff561e 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 void contructTypeToClassLiteralDeclarationMap() {
   }
 
   private Pair<JavaToJavaScriptMap, Set<JsNode>> execImpl() {
+    NameClashesFixer.exec(program);
     uninitializedValuePotentiallyObservable = optimize
         ? ComputePotentiallyObservableUninitializedValues.analyze(program)
         : Predicates.<JField>alwaysTrue();
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 e52b52124b2..32462581ed8 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 @@ public CharSequence getContent() {
     ArrayNormalizer.exec(jProgram);
     TypeTightener.exec(jProgram);
     MethodCallTightener.exec(jProgram);
-    NameClashesFixer.exec(jProgram);
 
     IntTypeMapper typeMapper = new IntTypeMapper();
     ResolveRuntimeTypeReferences.exec(jProgram, typeMapper, TypeOrder.FREQUENCY);