commit 96908a64cbdc7fd228dbf7c7d57d0082e78294b8
author Rico Wind <ricow@google.com> Tue May 07 08:49:14 2024 +0200
committer Rico Wind <ricow@google.com> Tue May 07 07:18:34 2024 +0000
tree 7bf1840919c8da5564311bd3f90bd09812ef3cdd
parent 8e652e427944ba73b90f0cf9155bf8f3db169bf5

Change usage of Class.getTypeName() to getName()

This is only available from android 26+, so we fail our compile on dex with these on pre 26

Bug: b/337801526
Change-Id: I40c51a5410777c0f6a262d5dcbd5d77fbe8ee237

src/main/java/com/android/tools/r8/graph/Code.java

diff --git a/src/main/java/com/android/tools/r8/graph/Code.java b/src/main/java/com/android/tools/r8/graph/Code.java
index 3e23b32..840655f 100644
--- a/src/main/java/com/android/tools/r8/graph/Code.java
+++ b/src/main/java/com/android/tools/r8/graph/Code.java
@@ -150,7 +150,7 @@
 
   /** Compute estimatedSizeForInlining() <= threshold. */
   public int getEstimatedSizeForInliningIfLessThanOrEquals(int threshold) {
-    throw new Unreachable(getClass().getTypeName());
+    throw new Unreachable(getClass().getName());
   }
 
   public final boolean estimatedSizeForInliningAtMost(int threshold) {

src/main/java/com/android/tools/r8/graph/ReferencedMembersCollector.java

diff --git a/src/main/java/com/android/tools/r8/graph/ReferencedMembersCollector.java b/src/main/java/com/android/tools/r8/graph/ReferencedMembersCollector.java
index c82116a..f403d3c 100644
--- a/src/main/java/com/android/tools/r8/graph/ReferencedMembersCollector.java
+++ b/src/main/java/com/android/tools/r8/graph/ReferencedMembersCollector.java
@@ -52,7 +52,7 @@
     } else if (code.isThrowNullCode()) {
       // Intentionally empty.
     } else {
-      assert false : code.getClass().getTypeName();
+      assert false : code.getClass().getName();
     }
   }
 

src/main/java/com/android/tools/r8/graph/lens/NestedGraphLens.java

diff --git a/src/main/java/com/android/tools/r8/graph/lens/NestedGraphLens.java b/src/main/java/com/android/tools/r8/graph/lens/NestedGraphLens.java
index 1186ce2..77605d8 100644
--- a/src/main/java/com/android/tools/r8/graph/lens/NestedGraphLens.java
+++ b/src/main/java/com/android/tools/r8/graph/lens/NestedGraphLens.java
@@ -295,6 +295,6 @@
 
   @Override
   public String toString() {
-    return getClass().getTypeName();
+    return getClass().getName();
   }
 }

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

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java
index dacdd2f..335f1fe 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/LirConverter.java
@@ -98,7 +98,7 @@
       return;
     }
 
-    timing.begin("LIR->LIR@" + graphLens.getClass().getTypeName());
+    timing.begin("LIR->LIR@" + graphLens.getClass().getName());
     rewriteLirWithUnappliedLens(appView, executorService);
     timing.end();
   }