commit 8852e5309a47c99d098aa85e8934cc06e8104807
author Nicolas Geoffray <ngeoffray@google.com> Wed Oct 30 09:43:35 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Oct 31 09:39:12 2019 +0000
tree 8316f4b25034531bacaab06aa235d64dd1f41e63
parent 7cf5607f472020711e36eedbbfebb25b40d3f90e

[jitzygote] Remap boot boot image methods in zygote when single-threaded.

This avoids concurrent updates made by other threads while copying the
data.

Bug: 143569713
Bug: 119800099
Test: boots
Change-Id: Ife0141a45b8d8671ab0c5868ccf90b4799a9f5db

runtime/jit/jit_code_cache.h

diff --git a/runtime/jit/jit_code_cache.h b/runtime/jit/jit_code_cache.h
index 637d5e3..58cf0e3 100644
--- a/runtime/jit/jit_code_cache.h
+++ b/runtime/jit/jit_code_cache.h
@@ -127,12 +127,17 @@
     region_->WriteData(compilation_state_, state);
   }
 
+  bool IsCompilationDoneButNotNotified() const {
+    return compilation_state_ != nullptr && *compilation_state_ == ZygoteCompilationState::kDone;
+  }
+
   bool IsCompilationNotified() const {
-    return *compilation_state_ > ZygoteCompilationState::kDone;
+    return compilation_state_ != nullptr && *compilation_state_ > ZygoteCompilationState::kDone;
   }
 
   bool CanMapBootImageMethods() const {
-    return *compilation_state_ == ZygoteCompilationState::kNotifiedOk;
+    return compilation_state_ != nullptr &&
+           *compilation_state_ == ZygoteCompilationState::kNotifiedOk;
   }
 
  private: