summaryrefslogtreecommitdiff
path: root/runtime/art_method.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2018-01-14 00:22:04 +0000
committer Mathieu Chartier <mathieuc@google.com> 2018-01-14 00:29:51 +0000
commitc971f6e06a43e70a2d86cb4b3ad0e13a9ae9a06c (patch)
tree9fa6be931e7bc8d0f47b0eb2d91a683ffcf1c3f1 /runtime/art_method.cc
parent94730ef9ca432b5ede81e928cffc4006911aa650 (diff)
Revert "Ensure that methods requiring interpreter entrypoint always have it."
This reverts commit 94730ef9ca432b5ede81e928cffc4006911aa650. Debug tests failing. Ran: test/run-test --always-clean --prebuild --compact-dex-level none --optimizing --no-relocate --runtime-option -Xcheck:jni --64 --build-with-javac-dx 067-preemptive-unpark Bug: 62821960 Change-Id: Ia4fb7b7b3a60879662dea50ce32b1cfb5e0a3eff
Diffstat (limited to 'runtime/art_method.cc')
-rw-r--r--runtime/art_method.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index f9eedae23e..44a5dde485 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -319,21 +319,6 @@ void ArtMethod::Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue*
self->AssertThreadSuspensionIsAllowable();
CHECK_EQ(kRunnable, self->GetState());
CHECK_STREQ(GetInterfaceMethodIfProxy(kRuntimePointerSize)->GetShorty(), shorty);
-
- if (!IsNative() &&
- !IsObsolete() &&
- !IsProxyMethod() &&
- IsInvokable() &&
- ClassLinker::ShouldUseInterpreterEntrypoint(this, GetEntryPointFromQuickCompiledCode())) {
- ClassLinker* cl = Runtime::Current()->GetClassLinker();
- const void* entry_point = GetEntryPointFromQuickCompiledCode();
- DCHECK(cl->IsQuickToInterpreterBridge(entry_point) ||
- cl->IsQuickResolutionStub(entry_point) ||
- entry_point == GetQuickInstrumentationEntryPoint())
- << PrettyMethod() << " is expected to be interpreted but has an unexpected entrypoint."
- << " The entrypoint is " << entry_point << " (incorrect) oat entrypoint would be "
- << GetOatMethodQuickCode(cl->GetImagePointerSize());
- }
}
// Push a transition back into managed code onto the linked list in thread.