diff options
| author | 2014-10-14 17:41:57 -0700 | |
|---|---|---|
| committer | 2014-10-16 19:27:28 -0700 | |
| commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
| tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /runtime/exception_test.cc | |
| parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) | |
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug: 17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'runtime/exception_test.cc')
| -rw-r--r-- | runtime/exception_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/exception_test.cc b/runtime/exception_test.cc index 3a17ecaa57..1714134d25 100644 --- a/runtime/exception_test.cc +++ b/runtime/exception_test.cc @@ -175,7 +175,7 @@ TEST_F(ExceptionTest, StackTraceElement) { 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_f_->ToNativePc(dex_pc)); // return pc + fake_stack.push_back(method_f_->ToNativeQuickPc(dex_pc)); // return pc // Create/push fake 16byte stack frame for method f fake_stack.push_back(reinterpret_cast<uintptr_t>(method_f_)); @@ -194,7 +194,7 @@ TEST_F(ExceptionTest, StackTraceElement) { // Set up thread to appear as if we called out of method_g_ at pc dex 3 thread->SetTopOfStack( reinterpret_cast<StackReference<mirror::ArtMethod>*>(&fake_stack[0]), - method_g_->ToNativePc(dex_pc)); // return pc + method_g_->ToNativeQuickPc(dex_pc)); // return pc } else { // Create/push fake 20-byte shadow frame for method g fake_stack.push_back(0); |