From a20ec9bb10d7ded8ae7d95d4de1e190d22260c73 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 12 Dec 2022 09:12:21 +0000 Subject: Fix clinit debug check in instrumentation. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing --jit --interpreter Change-Id: Idae620b0b8f9ed67574f5b785fdac3efcb534cfd --- runtime/jni/java_vm_ext.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/jni/java_vm_ext.cc') diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc index 9c695ca513..b4e7938e91 100644 --- a/runtime/jni/java_vm_ext.cc +++ b/runtime/jni/java_vm_ext.cc @@ -1157,7 +1157,7 @@ void* JavaVMExt::FindCodeForNativeMethod(ArtMethod* m, std::string* error_msg, b CHECK(m->IsNative()); ObjPtr c = m->GetDeclaringClass(); // If this is a static method, it could be called before the class has been initialized. - CHECK(c->IsInitializing() || !NeedsClinitCheckBeforeCall(m)) + CHECK(c->IsInitializing() || !m->NeedsClinitCheckBeforeCall()) << c->GetStatus() << " " << m->PrettyMethod(); Thread* const self = Thread::Current(); void* native_method = libraries_->FindNativeMethod(self, m, error_msg, can_suspend); -- cgit v1.2.3-59-g8ed1b