From 4762546c0566f0ef727a5025c16c1abf593a4139 Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Fri, 22 Apr 2022 16:52:13 +0000 Subject: Revert "Add additional checks for ArtMethod::GetOatQuickMethodHeader" This reverts commit bbbcea9ec41513a439283a6d7ad9798d7c4faa83. Reason for revert: https://android-build.googleplex.com/builds/submitted/8490058/aosp_x86-eng/latest/view/logs/build_error.log Change-Id: Ibca5761f7893d1c8e81dc6f67b2a2b513675f4cc --- compiler/exception_test.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'compiler/exception_test.cc') diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index 4471b93f17..495398b4b3 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -187,16 +187,14 @@ TEST_F(ExceptionTest, StackTraceElement) { fake_stack.push_back(0); } - OatQuickMethodHeader* header = OatQuickMethodHeader::FromEntryPoint( - method_g_->GetEntryPointFromQuickCompiledCode()); - fake_stack.push_back(header->ToNativeQuickPc( + fake_stack.push_back(method_g_->GetOatQuickMethodHeader(0)->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(header->ToNativeQuickPc( + fake_stack.push_back(method_g_->GetOatQuickMethodHeader(0)->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