Revert "Do a second check for testing intrinsic types."
This reverts commit 4daa0b4c21eee46362b5114fb2c3800c0c7e7a36.
If the intrinsic has a slow-path, like charAt, the slow-path logic will complain as it only understands direct slow-paths, not virtual calls.
We should either override that decision in the slow-path, or replace the HInvokeVirtual when we're overriding the intrinsic choice.
Bug: 23475673
Change-Id: If55fbc8c82d52e0e7a7aec2674ae2bd2b74b5c77
diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc
index feaaaf4..075ec1e 100644
--- a/compiler/optimizing/intrinsics.cc
+++ b/compiler/optimizing/intrinsics.cc
@@ -16,16 +16,12 @@
#include "intrinsics.h"
-#include "art_method.h"
-#include "class_linker.h"
#include "dex/quick/dex_file_method_inliner.h"
#include "dex/quick/dex_file_to_method_inliner_map.h"
#include "driver/compiler_driver.h"
#include "invoke_type.h"
-#include "mirror/dex_cache-inl.h"
#include "nodes.h"
#include "quick/inline_method_analyser.h"
-#include "scoped_thread_state_change.h"
#include "utils.h"
namespace art {
@@ -368,34 +364,17 @@
if (inst->IsInvoke()) {
HInvoke* invoke = inst->AsInvoke();
InlineMethod method;
- const DexFile& dex_file = invoke->GetDexFile();
- DexFileMethodInliner* inliner = driver_->GetMethodInlinerMap()->GetMethodInliner(&dex_file);
+ DexFileMethodInliner* inliner =
+ driver_->GetMethodInlinerMap()->GetMethodInliner(&invoke->GetDexFile());
DCHECK(inliner != nullptr);
if (inliner->IsIntrinsic(invoke->GetDexMethodIndex(), &method)) {
Intrinsics intrinsic = GetIntrinsic(method, graph_->GetInstructionSet());
if (intrinsic != Intrinsics::kNone) {
if (!CheckInvokeType(intrinsic, invoke)) {
- // We might be in a situation where we have inlined a method that calls an intrinsic,
- // but that method is in a different dex file on which we do not have a
- // verified_method that would have helped the compiler driver sharpen the call.
- // We can still ensure the invoke types match by checking whether the called method
- // is final or is in a final class.
- ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
- {
- ScopedObjectAccess soa(Thread::Current());
- ArtMethod* art_method = class_linker->FindDexCache(dex_file)->GetResolvedMethod(
- invoke->GetDexMethodIndex(), class_linker->GetImagePointerSize());
- DCHECK(art_method != nullptr);
- if (art_method->IsFinal() || art_method->GetDeclaringClass()->IsFinal()) {
- invoke->SetIntrinsic(intrinsic, NeedsEnvironmentOrCache(intrinsic));
- } else {
- LOG(WARNING) << "Found an intrinsic with unexpected invoke type: "
- << intrinsic << " for "
- << PrettyMethod(invoke->GetDexMethodIndex(), invoke->GetDexFile())
- << invoke->DebugName();
- }
- }
+ LOG(WARNING) << "Found an intrinsic with unexpected invoke type: "
+ << intrinsic << " for "
+ << PrettyMethod(invoke->GetDexMethodIndex(), invoke->GetDexFile());
} else {
invoke->SetIntrinsic(intrinsic, NeedsEnvironmentOrCache(intrinsic));
}