summaryrefslogtreecommitdiff
path: root/compiler/exception_test.cc
diff options
context:
space:
mode:
author Mythri Alle <mythria@google.com> 2022-04-25 07:49:36 +0000
committer Mythri Alle <mythria@google.com> 2022-04-25 13:17:33 +0000
commit0e8f1008bcdddb3e819caa527f26ca42e5452d9f (patch)
tree8124a279757d318a18065c351c3179bd364934e0 /compiler/exception_test.cc
parent5f1fafb6c9ec93e18a2d4da9c1d4d1264f9ba93d (diff)
Reland "Add additional checks for ArtMethod::GetOatQuickMethodHeader"
This reverts commit 4762546c0566f0ef727a5025c16c1abf593a4139. Reason for revert: relanding with a fix to build failures Change-Id: I1cf9152d4fb48878b6df89e6c8a2cb6d5949c5ee
Diffstat (limited to 'compiler/exception_test.cc')
-rw-r--r--compiler/exception_test.cc6
1 files changed, 4 insertions, 2 deletions
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<uintptr_t>(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