diff options
| -rw-r--r-- | compiler/optimizing/inliner.cc | 18 | ||||
| -rw-r--r-- | compiler/optimizing/inliner.h | 2 | ||||
| -rw-r--r-- | test/492-checker-inline-invoke-interface/expected.txt | 0 | ||||
| -rw-r--r-- | test/492-checker-inline-invoke-interface/info.txt | 1 | ||||
| -rw-r--r-- | test/492-checker-inline-invoke-interface/src/Main.java | 29 |
5 files changed, 12 insertions, 38 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index b984ef7a42..e51732396d 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -55,7 +55,7 @@ void HInliner::Run() { if (call != nullptr && call->GetIntrinsic() == Intrinsics::kNone) { // We use the original invoke type to ensure the resolution of the called method // works properly. - if (!TryInline(call, call->GetDexMethodIndex())) { + if (!TryInline(call, call->GetDexMethodIndex(), call->GetOriginalInvokeType())) { if (kIsDebugBuild) { std::string callee_name = PrettyMethod(call->GetDexMethodIndex(), *outer_compilation_unit_.GetDexFile()); @@ -69,18 +69,22 @@ void HInliner::Run() { } } -bool HInliner::TryInline(HInvoke* invoke_instruction, uint32_t method_index) const { +bool HInliner::TryInline(HInvoke* invoke_instruction, + uint32_t method_index, + InvokeType invoke_type) const { ScopedObjectAccess soa(Thread::Current()); const DexFile& caller_dex_file = *caller_compilation_unit_.GetDexFile(); VLOG(compiler) << "Try inlining " << PrettyMethod(method_index, caller_dex_file); - ClassLinker* class_linker = caller_compilation_unit_.GetClassLinker(); - // We can query the dex cache directly. The verifier has populated it already. - ArtMethod* resolved_method = class_linker->FindDexCache(caller_dex_file)->GetResolvedMethod( - method_index, class_linker->GetImagePointerSize()); + StackHandleScope<3> hs(soa.Self()); + Handle<mirror::DexCache> dex_cache( + hs.NewHandle(caller_compilation_unit_.GetClassLinker()->FindDexCache(caller_dex_file))); + Handle<mirror::ClassLoader> class_loader(hs.NewHandle( + soa.Decode<mirror::ClassLoader*>(caller_compilation_unit_.GetClassLoader()))); + ArtMethod* resolved_method(compiler_driver_->ResolveMethod( + soa, dex_cache, class_loader, &caller_compilation_unit_, method_index, invoke_type)); if (resolved_method == nullptr) { - // Method cannot be resolved if it is in another dex file we do not have access to. VLOG(compiler) << "Method cannot be resolved " << PrettyMethod(method_index, caller_dex_file); return false; } diff --git a/compiler/optimizing/inliner.h b/compiler/optimizing/inliner.h index 4602e77743..831bdf22a0 100644 --- a/compiler/optimizing/inliner.h +++ b/compiler/optimizing/inliner.h @@ -47,7 +47,7 @@ class HInliner : public HOptimization { static constexpr const char* kInlinerPassName = "inliner"; private: - bool TryInline(HInvoke* invoke_instruction, uint32_t method_index) const; + bool TryInline(HInvoke* invoke_instruction, uint32_t method_index, InvokeType invoke_type) const; bool TryBuildAndInline(ArtMethod* resolved_method, HInvoke* invoke_instruction, uint32_t method_index, diff --git a/test/492-checker-inline-invoke-interface/expected.txt b/test/492-checker-inline-invoke-interface/expected.txt deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/492-checker-inline-invoke-interface/expected.txt +++ /dev/null diff --git a/test/492-checker-inline-invoke-interface/info.txt b/test/492-checker-inline-invoke-interface/info.txt deleted file mode 100644 index 4a0a5ff1d3..0000000000 --- a/test/492-checker-inline-invoke-interface/info.txt +++ /dev/null @@ -1 +0,0 @@ -Checker test to ensure we can inline interface calls. diff --git a/test/492-checker-inline-invoke-interface/src/Main.java b/test/492-checker-inline-invoke-interface/src/Main.java deleted file mode 100644 index 9063af259d..0000000000 --- a/test/492-checker-inline-invoke-interface/src/Main.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -interface Itf { - public void $inline$foo(); -} - -public class Main implements Itf { - public void $inline$foo() { - } - - public static void main(String[] args) { - Itf itf = new Main(); - itf.$inline$foo(); - } -} |