Revert "x86_64: Store resolved MethodType-s in .bss."

This reverts commit a627c7e71a59135daab7f2fb8505d4873f61e4ac.

Reason for revert: 979-const-method-handle fails. Can repro with
ITERATIONS_FOR_JIT set to 120_000 and ./art/test/testrunner/testrunner.py --host --64 --jit --no-jvmti --debug --prebuild --checkjni --cms --no-relocate --ntrace --cdex-fast -b -t 979-const

Change-Id: I653a83aa12f2c28b163e0d43dbc95b8e8a190436

1 files changed, 0 insertions, 23 deletions

diff --git a/compiler/linker/linker_patch.h b/compiler/linker/linker_patch.h
index 133088240b..8ed7fce0ff 100644
--- a/compiler/linker/linker_patch.h
+++ b/compiler/linker/linker_patch.h
@@ -56,7 +56,6 @@ class LinkerPatch {
     kPackageTypeBssEntry,
     kStringRelative,
     kStringBssEntry,
-    kMethodTypeBssEntry,
     kCallEntrypoint,
     kBakerReadBarrierBranch,
   };
@@ -177,16 +176,6 @@ class LinkerPatch {
     return patch;
   }
 
-  static LinkerPatch MethodTypeBssEntryPatch(size_t literal_offset,
-                                             const DexFile* target_dex_file,
-                                             uint32_t pc_insn_offset,
-                                             uint32_t target_proto_idx) {
-    LinkerPatch patch(literal_offset, Type::kMethodTypeBssEntry, target_dex_file);
-    patch.proto_idx_ = target_proto_idx;
-    patch.pc_insn_offset_ = pc_insn_offset;
-    return patch;
-  }
-
   static LinkerPatch CallEntrypointPatch(size_t literal_offset,
                                          uint32_t entrypoint_offset) {
     LinkerPatch patch(literal_offset,
@@ -264,16 +253,6 @@ class LinkerPatch {
     return dex::StringIndex(string_idx_);
   }
 
-  const DexFile* TargetProtoDexFile() const {
-    DCHECK(patch_type_ == Type::kMethodTypeBssEntry);
-    return target_dex_file_;
-  }
-
-  dex::ProtoIndex TargetProtoIndex() const {
-    DCHECK(patch_type_ == Type::kMethodTypeBssEntry);
-    return dex::ProtoIndex(proto_idx_);
-  }
-
   uint32_t PcInsnOffset() const {
     DCHECK(patch_type_ == Type::kIntrinsicReference ||
            patch_type_ == Type::kDataBimgRelRo ||
@@ -326,14 +305,12 @@ class LinkerPatch {
     uint32_t method_idx_;         // Method index for Call/Method patches.
     uint32_t type_idx_;           // Type index for Type patches.
     uint32_t string_idx_;         // String index for String patches.
-    uint32_t proto_idx_;          // Proto index for MethodType patches.
     uint32_t intrinsic_data_;     // Data for IntrinsicObjects.
     uint32_t entrypoint_offset_;  // Entrypoint offset in the Thread object.
     uint32_t baker_custom_value1_;
     static_assert(sizeof(method_idx_) == sizeof(cmp1_), "needed by relational operators");
     static_assert(sizeof(type_idx_) == sizeof(cmp1_), "needed by relational operators");
     static_assert(sizeof(string_idx_) == sizeof(cmp1_), "needed by relational operators");
-    static_assert(sizeof(proto_idx_) == sizeof(cmp1_), "needed by relational operators");
     static_assert(sizeof(intrinsic_data_) == sizeof(cmp1_), "needed by relational operators");
     static_assert(sizeof(baker_custom_value1_) == sizeof(cmp1_), "needed by relational operators");
   };