diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-08-19 12:49:41 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-08-19 18:54:36 +0100 |
| commit | 581550137ee3a068a14224870e71aeee924a0646 (patch) | |
| tree | f62dd0d07c66a8ce4d7d994ee0e9c27bd8014bb1 /compiler/linker | |
| parent | 32f264e67afa8654a5570d38b627515fb73fc333 (diff) | |
| download | art-581550137ee3a068a14224870e71aeee924a0646.tar.gz art-581550137ee3a068a14224870e71aeee924a0646.tar.bz2 art-581550137ee3a068a14224870e71aeee924a0646.zip | |
Revert "Revert "Optimizing: Better invoke-static/-direct dispatch.""
Fixed kCallArtMethod to use correct callee location for
kRecursive. This combination is used when compiling with
debuggable flag set.
This reverts commit b2c431e80e92eb6437788cc544cee6c88c3156df.
Change-Id: Idee0f2a794199ebdf24892c60f8a5dcf057db01c
Diffstat (limited to 'compiler/linker')
| -rw-r--r-- | compiler/linker/x86/relative_patcher_x86.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/linker/x86/relative_patcher_x86.cc b/compiler/linker/x86/relative_patcher_x86.cc index 315585d9e7..24b1481c31 100644 --- a/compiler/linker/x86/relative_patcher_x86.cc +++ b/compiler/linker/x86/relative_patcher_x86.cc @@ -39,7 +39,8 @@ void X86RelativePatcher::PatchDexCacheReference(std::vector<uint8_t>* code, DCHECK_EQ((*code)[anchor_literal_offset] & 0xf8u, 0x58u); // Check that the patched data contains kDummy32BitOffset. - constexpr int kDummy32BitOffset = 256; // Must match X86Mir2Lir::kDummy32BitOffset. + // Must match X86Mir2Lir::kDummy32BitOffset and CodeGeneratorX86_64::kDummy32BitOffset. + constexpr int kDummy32BitOffset = 256; DCHECK_LE(literal_offset, code->size()); DCHECK_EQ((*code)[literal_offset + 0u], static_cast<uint8_t>(kDummy32BitOffset >> 0)); DCHECK_EQ((*code)[literal_offset + 1u], static_cast<uint8_t>(kDummy32BitOffset >> 8)); |