From 0e8f1008bcdddb3e819caa527f26ca42e5452d9f Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Mon, 25 Apr 2022 07:49:36 +0000 Subject: Reland "Add additional checks for ArtMethod::GetOatQuickMethodHeader" This reverts commit 4762546c0566f0ef727a5025c16c1abf593a4139. Reason for revert: relanding with a fix to build failures Change-Id: I1cf9152d4fb48878b6df89e6c8a2cb6d5949c5ee --- compiler/exception_test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'compiler/exception_test.cc') diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index 495398b4b3..4471b93f17 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -187,14 +187,16 @@ TEST_F(ExceptionTest, StackTraceElement) { fake_stack.push_back(0); } - fake_stack.push_back(method_g_->GetOatQuickMethodHeader(0)->ToNativeQuickPc( + OatQuickMethodHeader* header = OatQuickMethodHeader::FromEntryPoint( + method_g_->GetEntryPointFromQuickCompiledCode()); + fake_stack.push_back(header->ToNativeQuickPc( method_g_, kDexPc, /* is_for_catch_handler= */ false)); // return pc // Create/push fake 16byte stack frame for method g fake_stack.push_back(reinterpret_cast(method_g_)); fake_stack.push_back(0); fake_stack.push_back(0); - fake_stack.push_back(method_g_->GetOatQuickMethodHeader(0)->ToNativeQuickPc( + fake_stack.push_back(header->ToNativeQuickPc( method_g_, kDexPc, /* is_for_catch_handler= */ false)); // return pc // Create/push fake 16byte stack frame for method f -- cgit v1.2.3-59-g8ed1b