diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-08-19 12:46:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-19 12:46:09 +0000 |
| commit | d9c4d2e9a9bc01fd82a895091126406081fafb1f (patch) | |
| tree | 094657600e206c365e365634fab6d4758a3073f4 /compiler/linker | |
| parent | 464581adaf895d14f73db3d768729f0c9c6f5366 (diff) | |
| parent | b2c431e80e92eb6437788cc544cee6c88c3156df (diff) | |
| download | art-d9c4d2e9a9bc01fd82a895091126406081fafb1f.tar.gz art-d9c4d2e9a9bc01fd82a895091126406081fafb1f.tar.bz2 art-d9c4d2e9a9bc01fd82a895091126406081fafb1f.zip | |
Merge "Revert "Optimizing: Better invoke-static/-direct dispatch.""
Diffstat (limited to 'compiler/linker')
| -rw-r--r-- | compiler/linker/x86/relative_patcher_x86.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/linker/x86/relative_patcher_x86.cc b/compiler/linker/x86/relative_patcher_x86.cc index 24b1481c31..315585d9e7 100644 --- a/compiler/linker/x86/relative_patcher_x86.cc +++ b/compiler/linker/x86/relative_patcher_x86.cc @@ -39,8 +39,7 @@ void X86RelativePatcher::PatchDexCacheReference(std::vector<uint8_t>* code, DCHECK_EQ((*code)[anchor_literal_offset] & 0xf8u, 0x58u); // Check that the patched data contains kDummy32BitOffset. - // Must match X86Mir2Lir::kDummy32BitOffset and CodeGeneratorX86_64::kDummy32BitOffset. - constexpr int kDummy32BitOffset = 256; + constexpr int kDummy32BitOffset = 256; // Must match X86Mir2Lir::kDummy32BitOffset. 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)); |