Clean up AtomicDexRefMap

Make ClassReference, TypeReference, and MethodReference extend
DexFileReference. This enables using all of these types as the key
for AtomicDexRefMap.

Test: test-art-host
Bug: 63851220
Bug: 63756964

Change-Id: Ida3c94cadb53272cb5057e5cebc5971c1ab4d366

1 files changed, 10 insertions, 10 deletions

diff --git a/runtime/class_reference.h b/runtime/class_reference.h
index 7b206126d6..2ef9ab8959 100644
--- a/runtime/class_reference.h
+++ b/runtime/class_reference.h
@@ -20,22 +20,22 @@
 #include <stdint.h>
 #include <utility>
 
+#include "dex_file_reference.h"
+
 namespace art {
 
 class DexFile;
 
 // A class is uniquely located by its DexFile and the class_defs_ table index into that DexFile
-typedef std::pair<const DexFile*, uint32_t> ClassReference;
-
-inline bool operator<(const ClassReference& lhs, const ClassReference& rhs) {
-  if (lhs.second < rhs.second) {
-    return true;
-  } else if (lhs.second > rhs.second) {
-    return false;
-  } else {
-    return (lhs.first < rhs.first);
+class ClassReference : public DexFileReference {
+ public:
+  ClassReference(const DexFile* file, uint32_t class_def_idx)
+     : DexFileReference(file, class_def_idx) {}
+
+  uint32_t ClassDefIdx() const {
+    return index;
   }
-}
+};
 
 }  // namespace art