diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc
index 4b6115a..b73a7d8 100644
--- a/dex2oat/driver/compiler_driver.cc
+++ b/dex2oat/driver/compiler_driver.cc
@@ -696,11 +696,12 @@
             (method.GetAccessFlags() & kAccStatic) != 0;
         const bool is_startup_clinit = is_startup_class && is_clinit;
 
-        if (only_startup_strings &&
-            profile_compilation_info != nullptr &&
-            (!profile_compilation_info->GetMethodHotness(method.GetReference()).IsStartup() &&
-             !is_startup_clinit)) {
-          continue;
+        if (profile_compilation_info != nullptr && !is_startup_clinit) {
+          ProfileCompilationInfo::MethodHotness hotness =
+              profile_compilation_info->GetMethodHotness(method.GetReference());
+          if (only_startup_strings ? !hotness.IsStartup() : !hotness.IsInProfile()) {
+            continue;
+          }
         }
 
         // Resolve const-strings in the code. Done to have deterministic allocation behavior. Right