summaryrefslogtreecommitdiffstats
path: root/compiler/optimizing/code_generator_x86.h
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2016-12-12 16:28:54 +0000
committerNicolas Geoffray <ngeoffray@google.com>2016-12-12 16:28:54 +0000
commitd2d5262c8370309e1f2a009f00aafc24f1cf00a0 (patch)
tree15b542ac079f30043cd3654cf5d3c40ae3ea34d0 /compiler/optimizing/code_generator_x86.h
parent5b12f7973636bfea29da3956a9baa7a6bbe2b666 (diff)
downloadart-d2d5262c8370309e1f2a009f00aafc24f1cf00a0.tar.gz
art-d2d5262c8370309e1f2a009f00aafc24f1cf00a0.tar.bz2
art-d2d5262c8370309e1f2a009f00aafc24f1cf00a0.zip
Revert "Add kJitTableAddress for HLoadClass."
One test failure after merge. This reverts commit 5b12f7973636bfea29da3956a9baa7a6bbe2b666. Change-Id: I120c49e53274471fc1c82a10d52e99c83f5f85cc
Diffstat (limited to 'compiler/optimizing/code_generator_x86.h')
-rw-r--r--compiler/optimizing/code_generator_x86.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h
index c44da97a90..2ae3670bed 100644
--- a/compiler/optimizing/code_generator_x86.h
+++ b/compiler/optimizing/code_generator_x86.h
@@ -416,17 +416,12 @@ class CodeGeneratorX86 : public CodeGenerator {
Label* NewStringBssEntryPatch(HLoadString* load_string);
Label* NewPcRelativeDexCacheArrayPatch(const DexFile& dex_file, uint32_t element_offset);
Label* NewJitRootStringPatch(const DexFile& dex_file, dex::StringIndex dex_index);
- Label* NewJitRootClassPatch(const DexFile& dex_file, dex::TypeIndex dex_index, uint64_t address);
void MoveFromReturnRegister(Location trg, Primitive::Type type) OVERRIDE;
// Emit linker patches.
void EmitLinkerPatches(ArenaVector<LinkerPatch>* linker_patches) OVERRIDE;
- void PatchJitRootUse(uint8_t* code,
- const uint8_t* roots_data,
- const PatchInfo<Label>& info,
- uint64_t index_in_table) const;
void EmitJitRootPatches(uint8_t* code, const uint8_t* roots_data) OVERRIDE;
// Emit a write barrier.
@@ -628,9 +623,6 @@ class CodeGeneratorX86 : public CodeGenerator {
// Patches for string root accesses in JIT compiled code.
ArenaDeque<PatchInfo<Label>> jit_string_patches_;
- // Patches for class root accesses in JIT compiled code.
- ArenaDeque<PatchInfo<Label>> jit_class_patches_;
-
// Offset to the start of the constant area in the assembled code.
// Used for fixups to the constant area.
int32_t constant_area_start_;