Invert IsUsingDefaultBootImageLocation to IsUsingApexBootImageLocation.
Some tests are picking up the jit-zygote path, which is not intended.
Invert the flag so that if in doubt, we don't execute the experiment path.
Bug: 119800099
Change-Id: Ief3ff353cc25fa81157a75d917814982f3836ed0
diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 3770921..7dd4572 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -546,7 +546,7 @@
}
const void* JitCodeCache::GetZygoteSavedEntryPoint(ArtMethod* method) {
- if (!Runtime::Current()->IsUsingDefaultBootImageLocation() &&
+ if (Runtime::Current()->IsUsingApexBootImageLocation() &&
// Currently only applies to boot classpath
method->GetDeclaringClass()->GetClassLoader() == nullptr) {
const void* entry_point = nullptr;
@@ -1125,7 +1125,7 @@
method->GetEntryPointFromQuickCompiledCode())) {
// This situation currently only occurs in the jit-zygote mode.
DCHECK(Runtime::Current()->IsZygote());
- DCHECK(!Runtime::Current()->IsUsingDefaultBootImageLocation());
+ DCHECK(Runtime::Current()->IsUsingApexBootImageLocation());
DCHECK(method->GetProfilingInfo(kRuntimePointerSize) != nullptr);
DCHECK(method->GetDeclaringClass()->GetClassLoader() == nullptr);
// Save the entrypoint, so it can be fethed later once the class is
@@ -2015,7 +2015,7 @@
ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
if (class_linker->IsQuickResolutionStub(method->GetEntryPointFromQuickCompiledCode())) {
- if (Runtime::Current()->IsUsingDefaultBootImageLocation() || !Runtime::Current()->IsZygote()) {
+ if (!Runtime::Current()->IsUsingApexBootImageLocation() || !Runtime::Current()->IsZygote()) {
// Unless we're running as zygote in the jitzygote experiment, we currently don't save
// the JIT compiled code if we cannot update the entrypoint due to having the resolution stub.
VLOG(jit) << "Not compiling "