commit ccb6be2f49d8b020a682ff8fe7137b853c501c1c
author Ian Zerny <zerny@google.com> Tue Jun 27 15:51:52 2023 +0200
committer Ian Zerny <zerny@google.com> Tue Jun 27 15:51:52 2023 +0200
tree 3c70cc830dcfe514479c5108c93b3dd88686e487
parent 76f786c83c962f5fae1b7e25b3bed654dd80bad8

Move tracing of block order to after DEX workarounds

Bug: b/288273207
Change-Id: I78c2201b2fc31a82630ea4a21ab5b2fb22d02221

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

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java b/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
index 94abe9d..8d7ddab 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRToDexFinalizer.java
@@ -39,8 +39,8 @@
       D8NestBasedAccessDesugaring.checkAndFailOnIncompleteNests(appView);
     }
     DexEncodedMethod method = code.method();
-    code.traceBlocks();
     workaroundBugs(code, timing);
+    code.traceBlocks();
     // Perform register allocation.
     RegisterAllocator registerAllocator = performRegisterAllocation(code, method, timing);
     return new DexBuilder(code, bytecodeMetadataProvider, registerAllocator, options).build();