Reland "Cleanups around the creation of ProfilingInfo."
This reverts commit a996425197a7946eae02d218f70610a853f2fe9a.
Bug: 112676029
Reason for revert: Fixed JitCodeCache::InvalidateAllCompiledCode and
ForceJitCompiled.
Change-Id: Ia87fda1bb40c504d9294e447f899ac1797ae98fc
diff --git a/runtime/jit/jit_code_cache.h b/runtime/jit/jit_code_cache.h
index e8ab117..7c828ae 100644
--- a/runtime/jit/jit_code_cache.h
+++ b/runtime/jit/jit_code_cache.h
@@ -197,8 +197,7 @@
bool NotifyCompilationOf(ArtMethod* method,
Thread* self,
CompilationKind compilation_kind,
- bool prejit,
- JitMemoryRegion* region)
+ bool prejit)
REQUIRES_SHARED(Locks::mutator_lock_)
REQUIRES(!Locks::jit_lock_);
@@ -228,10 +227,6 @@
// Return true if the code cache contains this pc in the private region (i.e. not from zygote).
bool PrivateRegionContainsPc(const void* pc) const;
- // Returns true if either the method's entrypoint is JIT compiled code or it is the
- // instrumentation entrypoint and we can jump to jit code for this method. For testing use only.
- bool WillExecuteJitCode(ArtMethod* method) REQUIRES(!Locks::jit_lock_);
-
// Return true if the code cache contains this method.
bool ContainsMethod(ArtMethod* method) REQUIRES(!Locks::jit_lock_);
@@ -314,12 +309,10 @@
REQUIRES(!Locks::jit_lock_)
REQUIRES_SHARED(Locks::mutator_lock_);
- // Create a 'ProfileInfo' for 'method'. If 'retry_allocation' is true,
- // will collect and retry if the first allocation is unsuccessful.
+ // Create a 'ProfileInfo' for 'method'.
ProfilingInfo* AddProfilingInfo(Thread* self,
ArtMethod* method,
- const std::vector<uint32_t>& entries,
- bool retry_allocation)
+ const std::vector<uint32_t>& entries)
REQUIRES(!Locks::jit_lock_)
REQUIRES_SHARED(Locks::mutator_lock_);