Change DIEDataRef to be a SIMPLE_DATA_REF because it doesn't have any references

Author: rastogishubham

llvm/include/llvm/MCCAS/MCCASObjectV1.def

@@ -25,6 +25,7 @@ CASV1_SIMPLE_DATA_REF(DebugAbbrevUnoptRef, mc:debug_abbrev_unopt)
 CASV1_SIMPLE_DATA_REF(DistinctDebugLineRef, mc:debug_line_distinct_data)
 CASV1_SIMPLE_DATA_REF(DIEAbbrevRef, mc:debug_DIE_abbrev)
 CASV1_SIMPLE_DATA_REF(DIEDistinctDataRef, mc:debug_DIE_distinct_data)
+CASV1_SIMPLE_DATA_REF(DIEDataRef, mc:debug_DIE_data)
 CASV1_SIMPLE_DATA_REF(AddendsRef, mc:addends)
 
 #undef CASV1_SIMPLE_DATA_REF

llvm/include/llvm/MCCAS/MCCASObjectV1.h

@@ -681,40 +681,6 @@ class DebugInfoSectionRef : public SpecificRef<DebugInfoSectionRef> {
   explicit DebugInfoSectionRef(SpecificRefT Ref) : SpecificRefT(Ref) {}
 };
 
-class DIEDataRef : public SpecificRef<DIEDataRef> {
-  using SpecificRefT = SpecificRef<DIEDataRef>;
-  friend class SpecificRef<DIEDataRef>;
-
-public:
-  static constexpr StringLiteral KindString = "mc:debug_DIE_data";
-  static Expected<DIEDataRef> create(MCCASBuilder &MB,
-                                     ArrayRef<cas::ObjectRef> Children,
-                                     ArrayRef<char> Contents);
-
-  static Expected<DIEDataRef> get(Expected<MCObjectProxy> Ref) {
-    auto Specific = SpecificRefT::getSpecific(std::move(Ref));
-    if (!Specific)
-      return Specific.takeError();
-    return DIEDataRef(*Specific);
-  }
-  static Expected<DIEDataRef> get(const MCSchema &Schema, cas::ObjectRef ID) {
-    return get(Schema.get(ID));
-  }
-  static std::optional<DIEDataRef> Cast(MCObjectProxy Ref) {
-    auto Specific = SpecificRefT::Cast(Ref);
-    if (!Specific)
-      return std::nullopt;
-    return DIEDataRef(*Specific);
-  }
-  Expected<uint64_t> materialize(MCCASReader &Reader,
-                                 ArrayRef<char> AbbrevSectionContents,
-                                 ArrayRef<uint32_t> SecOffsetVals,
-                                 raw_ostream *Stream = nullptr) const;
-
-private:
-  explicit DIEDataRef(SpecificRefT Ref) : SpecificRefT(Ref) {}
-};
-
 struct LoadedDIETopLevel {
   SmallVector<StringRef, 0> AbbrevEntries;
   DIEDistinctDataRef DistinctData;

llvm/lib/MCCAS/MCCASObjectV1.cpp

@@ -170,7 +170,6 @@ Error MCSchema::fillCache() {
       PaddingRef::KindString,
       MCAssemblerRef::KindString,
       DebugInfoSectionRef::KindString,
-      DIEDataRef::KindString,
 #define CASV1_SIMPLE_DATA_REF(RefName, IdentifierName) RefName::KindString,
 #define CASV1_SIMPLE_GROUP_REF(RefName, IdentifierName) RefName::KindString,
 #define MCFRAGMENT_NODE_REF(MCFragmentName, MCEnumName, MCEnumIdentifier)      \
@@ -1893,7 +1892,7 @@ struct DIEDataWriter : public DataWriter {
 
   /// Saves the main data stream and any children to a new DIEDataRef node.
   Expected<DIEDataRef> getCASNode(MCCASBuilder &CASBuilder) {
-    auto Ref = DIEDataRef::create(CASBuilder, Children, Data);
+    auto Ref = DIEDataRef::create(CASBuilder, toStringRef(Data));
     Data.clear();
     return Ref;
   }
@@ -2932,17 +2931,6 @@ DIEDedupeTopLevelRef::create(MCCASBuilder &MB,
   return get(B->build());
 }
 
-Expected<DIEDataRef> DIEDataRef::create(MCCASBuilder &MB,
-                                        ArrayRef<cas::ObjectRef> Children,
-                                        ArrayRef<char> Contents) {
-  Expected<Builder> B = Builder::startNode(MB.Schema, KindString);
-  if (!B)
-    return B.takeError();
-  append_range(B->Refs, Children);
-  append_range(B->Data, toStringRef(Contents));
-  return get(B->build());
-}
-
 // Returns true if DIE should be placed in a separate CAS block.
 static bool shouldCreateSeparateBlockFor(DWARFDie &DIE) {
   dwarf::Tag Tag = DIE.getTag();