commit e3c6dfe2009d2fad6f8e4401cb17935bdd09ab9e
author Nicolas Geoffray <ngeoffray@google.com> Fri Dec 07 15:05:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 15:05:02 2018 +0000
tree df3a2b3e594be74554c97e006fc4d3271bcabaad
parent 58431a7cf863b2eb7fe25eff6a28ec376f2f151d
parent 1c1c6e67d858db7fd9296260d4e6e8cff84a0364

Merge "Remove CHECK and don't free code/data in zygote space."

runtime/jit/jit_code_cache.cc

diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 1d53a58..fdb6b86 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -2072,7 +2072,10 @@
 }
 
 void JitCodeCache::FreeCode(uint8_t* code) {
-  CHECK(!IsInZygoteExecSpace(code));
+  if (IsInZygoteExecSpace(code)) {
+    // No need to free, this is shared memory.
+    return;
+  }
   used_memory_for_code_ -= mspace_usable_size(code);
   mspace_free(exec_mspace_, code);
 }
@@ -2084,7 +2087,10 @@
 }
 
 void JitCodeCache::FreeData(uint8_t* data) {
-  CHECK(!IsInZygoteDataSpace(data));
+  if (IsInZygoteDataSpace(data)) {
+    // No need to free, this is shared memory.
+    return;
+  }
   used_memory_for_data_ -= mspace_usable_size(data);
   mspace_free(data_mspace_, data);
 }