summaryrefslogtreecommitdiff
path: root/runtime/jit/jit_code_cache.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2019-06-26 22:00:02 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2019-06-26 22:00:38 +0000
commit2fef66b294417d447630f9d98de68227eef476d3 (patch)
tree59fc4ea6cf13217eb92fbdd4e39561b5ad518cf0 /runtime/jit/jit_code_cache.h
parent21d5994583c679cd5d8573b5d35dbd659bdca2c7 (diff)
Revert "Make the JIT zygote memory shared."
This reverts commit 05f87217ddc9b4b9186710c0135b918f456c5aef. Bug: 119800099 Bug: 136110523 Reason for revert: testWebview flaking Change-Id: I96afa6bc9c56c4aaf5ed72ae370f6f69c096c559
Diffstat (limited to 'runtime/jit/jit_code_cache.h')
-rw-r--r--runtime/jit/jit_code_cache.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/runtime/jit/jit_code_cache.h b/runtime/jit/jit_code_cache.h
index a777ab740f..a4e2964499 100644
--- a/runtime/jit/jit_code_cache.h
+++ b/runtime/jit/jit_code_cache.h
@@ -96,11 +96,7 @@ class JitCodeCache {
std::string* error_msg);
~JitCodeCache();
- bool NotifyCompilationOf(ArtMethod* method,
- Thread* self,
- bool osr,
- bool prejit,
- JitMemoryRegion* region)
+ bool NotifyCompilationOf(ArtMethod* method, Thread* self, bool osr, bool prejit)
REQUIRES_SHARED(Locks::mutator_lock_)
REQUIRES(!Locks::jit_lock_);
@@ -217,7 +213,7 @@ class JitCodeCache {
REQUIRES_SHARED(Locks::mutator_lock_);
bool OwnsSpace(const void* mspace) const NO_THREAD_SAFETY_ANALYSIS {
- return private_region_.OwnsSpace(mspace) || shared_region_.OwnsSpace(mspace);
+ return private_region_.OwnsSpace(mspace);
}
void* MoreCore(const void* mspace, intptr_t increment);
@@ -280,8 +276,7 @@ class JitCodeCache {
// is debuggable.
void ClearEntryPointsInZygoteExecSpace() REQUIRES(!Locks::jit_lock_) REQUIRES(Locks::mutator_lock_);
- JitMemoryRegion* GetCurrentRegion();
- bool IsSharedRegion(const JitMemoryRegion& region) const { return &region == &shared_region_; }
+ JitMemoryRegion* GetPrivateRegion() { return &private_region_; }
private:
JitCodeCache();