diff options
| author | 2016-07-25 12:49:15 +0100 | |
|---|---|---|
| committer | 2016-07-25 12:49:15 +0100 | |
| commit | d549c28cfbddba945cb88857bcca3dce1414fb29 (patch) | |
| tree | 584d765beea2cd6ceb4d56789ccc5c8f64db967e /compiler/optimizing/code_generator.h | |
| parent | 9e27d02040ff87eb8e2d56d21347a77cb800eddf (diff) | |
Remove two ReadBarrierMarkRegX entrypoints.
As entry points ReadBarrierMarkReg30 and
ReadBarrierMarkReg31 are undefined on all architectures
supporting the read barrier configuration (ARM, ARM64, x86
and x86-64), remove them from the entry point list.
Test: ART host and target (ARM, ARM64) tests.
Bug: 29506760
Bug: 12687968
Change-Id: I500626e54f00aebfc095b4ef5f81b49fa43f7768
Diffstat (limited to 'compiler/optimizing/code_generator.h')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 5e6e175c67..68de1aa1b1 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -359,7 +359,8 @@ class CodeGenerator : public DeletableArenaObject<kArenaAllocCodeGenerator> { // Return the entry point offset for ReadBarrierMarkRegX, where X is `reg`. template <size_t pointer_size> static int32_t GetReadBarrierMarkEntryPointsOffset(size_t reg) { - DCHECK_LT(reg, 32u); + // The entry point list defines 30 ReadBarrierMarkRegX entry points. + DCHECK_LT(reg, 30u); // The ReadBarrierMarkRegX entry points are ordered by increasing // register number in Thread::tls_Ptr_.quick_entrypoints. return QUICK_ENTRYPOINT_OFFSET(pointer_size, pReadBarrierMarkReg00).Int32Value() |