Revert "Try really hard for JIT in test 916"
This reverts commit a64fa43345124eb7891b9d6a6258f6ed0cbd1504.
Reason for revert: makes test-art-host-run-test-debug-prebuild-interpreter-relocate-trace-cms-checkjni-picimage-npictest-ndebuggable-916-obsolete-jit fail
Test: Treehugger
Change-Id: Idce6fc9310fe85ae62dd19da1e978299951c19ee
diff --git a/test/common/runtime_state.cc b/test/common/runtime_state.cc
index 271657f..7451cf9 100644
--- a/test/common/runtime_state.cc
+++ b/test/common/runtime_state.cc
@@ -152,12 +152,7 @@
jclass,
jclass cls,
jstring method_name) {
- Runtime* runtime = Runtime::Current();
- if (runtime == nullptr) {
- // We must be on the RI. We will just roll with it.
- return;
- }
- jit::Jit* jit = runtime->GetJit();
+ jit::Jit* jit = Runtime::Current()->GetJit();
if (jit == nullptr) {
return;
}
@@ -171,11 +166,6 @@
CHECK(chars.c_str() != nullptr);
method = soa.Decode<mirror::Class>(cls)->FindDeclaredDirectMethodByName(
chars.c_str(), kRuntimePointerSize);
- if (method == nullptr) {
- method = soa.Decode<mirror::Class>(cls)->FindDeclaredVirtualMethodByName(
- chars.c_str(), kRuntimePointerSize);
- }
- DCHECK(method != nullptr) << "Unable to find method called " << chars.c_str();
}
jit::JitCodeCache* code_cache = jit->GetCodeCache();