OSDN Git Service

Revert "Revert CC related changes."
authorMathieu Chartier <mathieuc@google.com>
Wed, 30 Nov 2016 18:15:41 +0000 (10:15 -0800)
committerMathieu Chartier <mathieuc@google.com>
Wed, 30 Nov 2016 19:01:52 +0000 (11:01 -0800)
commit5ace201d84adb7753680bf4c7877b3b71558da82
tree4687d41f5a1c8358e8356066d1e1b43b231b6037
parent304f2d3a1d090846a7a55a0016efc9fc8eb14078
Revert "Revert CC related changes."

Disable entrypoint switching in ResetQuickAllocEntryPointsForThread
instead of callers. Fixes bug where instrumentation would switch
to non CC entrypoints for non X86_64 architectures causing aborts.

Bug: 31018974

Test: test-art-host
Test: test/run-test 099

This reverts commit 96172e0172c5fca6e9a5ad4b857a24d8c7b064e5.

Change-Id: If206694ae35ff4446c6a8a97bfbcbf2dac35e3f9
13 files changed:
runtime/arch/mips/entrypoints_init_mips.cc
runtime/arch/quick_alloc_entrypoints.S
runtime/arch/x86/quick_entrypoints_x86.S
runtime/arch/x86_64/quick_entrypoints_x86_64.S
runtime/entrypoints/quick/quick_alloc_entrypoints.cc
runtime/entrypoints/quick/quick_alloc_entrypoints.h
runtime/entrypoints/quick/quick_default_init_entrypoints.h
runtime/gc/heap-inl.h
runtime/gc/heap.cc
runtime/gc/heap.h
runtime/instrumentation.cc
runtime/thread.cc
runtime/thread.h