diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 9 | ||||
| -rw-r--r-- | compiler/optimizing/optimizing_compiler_stats.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index cdd8fb2638..cfde561194 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -1379,6 +1379,15 @@ bool HInliner::IsInliningAllowed(ArtMethod* method, const CodeItemDataAccessor& return false; } + if (annotations::MethodIsNeverInline(*method->GetDexFile(), + method->GetClassDef(), + method->GetDexMethodIndex())) { + LOG_FAIL(stats_, MethodCompilationStat::kNotInlinedNeverInlineAnnotation) + << "Method " << method->PrettyMethod() + << " has the @NeverInline annotation so it won't be inlined"; + return false; + } + return true; } diff --git a/compiler/optimizing/optimizing_compiler_stats.h b/compiler/optimizing/optimizing_compiler_stats.h index 5e316ba403..18b3a60546 100644 --- a/compiler/optimizing/optimizing_compiler_stats.h +++ b/compiler/optimizing/optimizing_compiler_stats.h @@ -96,6 +96,7 @@ enum class MethodCompilationStat { kNotInlinedTryCatchCallee, kNotInlinedRegisterAllocator, kNotInlinedCannotBuild, + kNotInlinedNeverInlineAnnotation, kNotInlinedNotCompilable, kNotInlinedNotVerified, kNotInlinedCodeItem, |