Revert "Relax HasSeenMethod check"
Parent change breaks target tests.
This reverts commit 80e6d7376d10edcc6e0abbb5d34e7cfaff3d55c1.
Change-Id: Ic6510e2d6f05df88364f0f27836ac30e60064bf8
diff --git a/runtime/jit/profile_saver.cc b/runtime/jit/profile_saver.cc
index dec2856..556fe66 100644
--- a/runtime/jit/profile_saver.cc
+++ b/runtime/jit/profile_saver.cc
@@ -800,10 +800,7 @@
return false;
}
ProfileCompilationInfo::MethodHotness hotness = info.GetMethodHotness(ref);
- // Ignore hot parameter for now since it was causing test 595 to be flaky. TODO: Investigate.
- // b/63635729
- UNUSED(hot);
- return hotness.IsInProfile();
+ return hot ? hotness.IsHot() : hotness.IsInProfile();
}
return false;
}
diff --git a/test/595-profile-saving/profile-saving.cc b/test/595-profile-saving/profile-saving.cc
index 00aa944..b2b7ef2 100644
--- a/test/595-profile-saving/profile-saving.cc
+++ b/test/595-profile-saving/profile-saving.cc
@@ -38,10 +38,7 @@
CHECK(method != nullptr);
ScopedObjectAccess soa(env);
ObjPtr<mirror::Executable> exec = soa.Decode<mirror::Executable>(method);
- ArtMethod* art_method = exec->GetArtMethod();
- if (!ProfilingInfo::Create(soa.Self(), art_method, /* retry_allocation */ true)) {
- LOG(ERROR) << "Failed to create profiling info for method " << art_method->PrettyMethod();
- }
+ ProfilingInfo::Create(soa.Self(), exec->GetArtMethod(), /* retry_allocation */ true);
}
extern "C" JNIEXPORT void JNICALL Java_Main_ensureProfileProcessing(JNIEnv*, jclass) {
