diff options
Diffstat (limited to 'runtime/jit/jit_code_cache.cc')
| -rw-r--r-- | runtime/jit/jit_code_cache.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc index c02a699eed..519655d843 100644 --- a/runtime/jit/jit_code_cache.cc +++ b/runtime/jit/jit_code_cache.cc @@ -1581,9 +1581,19 @@ bool JitCodeCache::NotifyCompilationOf(ArtMethod* method, Thread* self, bool osr, bool prejit, + bool baseline, JitMemoryRegion* region) { - if (!osr && ContainsPc(method->GetEntryPointFromQuickCompiledCode())) { - return false; + const void* existing_entry_point = method->GetEntryPointFromQuickCompiledCode(); + if (!osr && ContainsPc(existing_entry_point)) { + OatQuickMethodHeader* method_header = + OatQuickMethodHeader::FromEntryPoint(existing_entry_point); + if (CodeInfo::IsBaseline(method_header->GetOptimizedCodeInfoPtr()) == baseline) { + VLOG(jit) << "Not compiling " + << method->PrettyMethod() + << " because it has already been compiled" + << " baseline=" << std::boolalpha << baseline; + return false; + } } if (NeedsClinitCheckBeforeCall(method) && !prejit) { |