commit e0f5f3ccd74c50db79871aec0e37ab63d2f36ee8
author Ian Zerny <zerny@google.com> Tue Jun 27 11:34:21 2023 +0200
committer Ian Zerny <zerny@google.com> Tue Jun 27 11:34:21 2023 +0200
tree 1538d494486d7f3a50d5e2fafa32511033689b0a
parent 541e1bebc04e1183c1cf0b4482d9b2a1cce7156b

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 8daabb4..a9bd5e5 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
@@ -36,8 +36,8 @@
   public DexCode finalizeCode(
       IRCode code, BytecodeMetadataProvider bytecodeMetadataProvider, Timing timing) {
     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();