Merge commit 'c31cba11a9d0ec474e5d57a09a3731d17e355875' into dev-release
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index ca98aff..ce1dadb 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1090,8 +1090,8 @@
   }
 
   private void traceConstClassOrCheckCast(DexType type, ProgramMethod currentMethod) {
+    traceTypeReference(type, currentMethod);
     if (!forceProguardCompatibility) {
-      traceTypeReference(type, currentMethod);
       return;
     }
     DexType baseType = type.toBaseType(appView.dexItemFactory());