diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2017-02-03 10:35:47 +0000 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2017-02-03 10:35:47 +0000 |
commit | d16da8bd8106452eea82408748dc6b3fd64bcb80 (patch) | |
tree | 027c5bfdea98ec8726436e695b5eb4d9572bbaf5 /compiler/optimizing/optimizing_compiler.cc | |
parent | f290c01c61f8a2979efa74ffcd2f54c5e426a3d0 (diff) |
Revert "Inline across dex files for JIT."
Broke hikey build.
bug:30933338
This reverts commit f290c01c61f8a2979efa74ffcd2f54c5e426a3d0.
Change-Id: I3363d703c54d0f9b69197a29395cc08f60c8b2ac
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index b4c746f2c1..297500b12f 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1129,26 +1129,6 @@ bool IsCompilingWithCoreImage() { return false; } -bool EncodeArtMethodInInlineInfo(ArtMethod* method ATTRIBUTE_UNUSED) { - // Note: the runtime is null only for unit testing. - return Runtime::Current() == nullptr || !Runtime::Current()->IsAotCompiler(); -} - -bool CanEncodeInlinedMethodInStackMap(const DexFile& caller_dex_file, ArtMethod* callee) { - ScopedObjectAccess soa(Thread::Current()); - if (!Runtime::Current()->IsAotCompiler()) { - // JIT can always encode methods in stack maps. - return true; - } - if (IsSameDexFile(caller_dex_file, *callee->GetDexFile())) { - return true; - } - // TODO(ngeoffray): Support more AOT cases for inlining: - // - methods in multidex - // - methods in boot image for on-device non-PIC compilation. - return false; -} - bool OptimizingCompiler::JitCompile(Thread* self, jit::JitCodeCache* code_cache, ArtMethod* method, |