commit 0211840461ef3a4d84b965ad3beb3d7e758319ac
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 26 07:51:52 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 26 07:51:52 2018 +0000
tree 4ef6e127b12bbc6a437c078a8012b5380a091d2c
parent 785d0fa2e55fe8258730353d40cfc51beed25e79
parent 1cbc764c493259346312829318a554c7cb112d5b

Merge "Unique names in case of class merging conflicts"

src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
index d9fa610..00a94a9 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
@@ -126,8 +126,8 @@
     computeInitializers();
     types = new TypeVerificationHelper(code, factory, appInfo).computeVerificationTypes();
     splitExceptionalBlocks();
-    LoadStoreHelper loadStoreHelper = new LoadStoreHelper(code, types);
     DeadCodeRemover.removeDeadCode(code, rewriter, graphLense, options);
+    LoadStoreHelper loadStoreHelper = new LoadStoreHelper(code, types);
     loadStoreHelper.insertLoadsAndStores();
     removeUnneededLoadsAndStores();
     registerAllocator = new CfRegisterAllocator(code, options);