Revert "Revert "Basic structural redefinition support""
This reverts commit 5a2301d897294ff4ee6de71f459dc2566dc3fa1a.
Bug: 134162467
Reason for revert: Relanding as unclear if issue is due to topic.
Change-Id: Ib1d1cf2e9132e30c9649b760ae9ae2d8ceacf843
diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index c0342ba..ecfe9b6 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -1686,6 +1686,28 @@
}
}
+void JitCodeCache::InvalidateAllCompiledCode() {
+ art::MutexLock mu(Thread::Current(), *Locks::jit_lock_);
+ size_t cnt = profiling_infos_.size();
+ size_t osr_size = osr_code_map_.size();
+ for (ProfilingInfo* pi : profiling_infos_) {
+ // NB Due to OSR we might run this on some methods multiple times but this should be fine.
+ ArtMethod* meth = pi->GetMethod();
+ pi->SetSavedEntryPoint(nullptr);
+ // We had a ProfilingInfo so we must be warm.
+ ClearMethodCounter(meth, /*was_warm=*/true);
+ ClassLinker* linker = Runtime::Current()->GetClassLinker();
+ if (meth->IsObsolete()) {
+ linker->SetEntryPointsForObsoleteMethod(meth);
+ } else {
+ linker->SetEntryPointsToInterpreter(meth);
+ }
+ }
+ osr_code_map_.clear();
+ VLOG(jit) << "Invalidated the compiled code of " << (cnt - osr_size) << " methods and "
+ << osr_size << " OSRs.";
+}
+
void JitCodeCache::InvalidateCompiledCodeFor(ArtMethod* method,
const OatQuickMethodHeader* header) {
DCHECK(!method->IsNative());
diff --git a/runtime/jit/jit_code_cache.h b/runtime/jit/jit_code_cache.h
index 64607b6..154700f 100644
--- a/runtime/jit/jit_code_cache.h
+++ b/runtime/jit/jit_code_cache.h
@@ -274,6 +274,10 @@
REQUIRES(!Locks::jit_lock_)
REQUIRES_SHARED(Locks::mutator_lock_);
+ void InvalidateAllCompiledCode()
+ REQUIRES(!Locks::jit_lock_)
+ REQUIRES_SHARED(Locks::mutator_lock_);
+
void InvalidateCompiledCodeFor(ArtMethod* method, const OatQuickMethodHeader* code)
REQUIRES(!Locks::jit_lock_)
REQUIRES_SHARED(Locks::mutator_lock_);