Nestedv1 also splits debug_abbrev and debug_info blocks properly

Author: rastogishubham

llvm/include/llvm/CASObjectFormats/NestedV1.h

@@ -273,11 +273,10 @@ class BlockDataRef : public SpecificRef<BlockDataRef> {
                                                uint64_t AlignmentOffset,
                                                ArrayRef<Fixup> Fixups);
 
-  static Expected<BlockDataRef> createContent(const ObjectFileSchema &Schema,
-                                              StringRef Content,
-                                              uint64_t Alignment,
-                                              uint64_t AlignmentOffset,
-                                              ArrayRef<Fixup> Fixups);
+  static Expected<BlockDataRef>
+  createContent(const ObjectFileSchema &Schema, StringRef Content,
+                uint64_t Alignment, uint64_t AlignmentOffset,
+                ArrayRef<Fixup> Fixups, bool IsDebugInfoBlock = false);
 
   static Expected<BlockDataRef> create(const ObjectFileSchema &Schema,
                                        const jitlink::Block &Block,
@@ -288,11 +287,10 @@ class BlockDataRef : public SpecificRef<BlockDataRef> {
   explicit BlockDataRef(SpecificRefT Ref, data::BlockData Data)
       : SpecificRefT(Ref), Data(Data) {}
 
-  static Expected<BlockDataRef> createImpl(const ObjectFileSchema &Schema,
-                                           Optional<StringRef> Content,
-                                           uint64_t Size, uint64_t Alignment,
-                                           uint64_t AlignmentOffset,
-                                           ArrayRef<Fixup> Fixups);
+  static Expected<BlockDataRef>
+  createImpl(const ObjectFileSchema &Schema, Optional<StringRef> Content,
+             uint64_t Size, uint64_t Alignment, uint64_t AlignmentOffset,
+             ArrayRef<Fixup> Fixups, bool IsDebugInfoBlock = false);
 };
 
 /// A variant of SymbolRef and IndirectSymbolRef. The kind is cached.
@@ -521,7 +519,8 @@ class BlockRef : public SpecificRef<BlockRef> {
   static Expected<BlockRef>
   create(const ObjectFileSchema &Schema, const jitlink::Block &Block,
          function_ref<Expected<Optional<TargetRef>>(const jitlink::Symbol &)>
-             GetTargetRef);
+             GetTargetRef,
+         cas::CASID *AbbrevID = nullptr);
 
   static Expected<BlockRef> create(const ObjectFileSchema &Schema,
                                    SectionRef Section, BlockDataRef Data) {
@@ -535,7 +534,7 @@ class BlockRef : public SpecificRef<BlockRef> {
     return createImpl(Schema, Section, Data, TargetInfo, Targets, Fixups);
   }
 
-  static Expected<BlockRef> get(Expected<ObjectFormatObjectProxy> Ref);
+  static Expected<BlockRef> get(Expected<ObjectFormatObjectProxy> Ref, bool IsDebugInfoBlock = false);
   static Expected<BlockRef> get(const ObjectFileSchema &Schema,
                                 cas::ObjectRef ID) {
     return get(Schema.get(ID));
@@ -558,11 +557,11 @@ class BlockRef : public SpecificRef<BlockRef> {
 
   explicit BlockRef(SpecificRefT Ref) : SpecificRefT(Ref) {}
 
-  static Expected<BlockRef> createImpl(const ObjectFileSchema &Schema,
-                                       SectionRef Section, BlockDataRef Data,
-                                       ArrayRef<TargetInfo> TargetInfo,
-                                       ArrayRef<TargetRef> Targets,
-                                       ArrayRef<Fixup> Fixups);
+  static Expected<BlockRef>
+  createImpl(const ObjectFileSchema &Schema, SectionRef Section,
+             BlockDataRef Data, ArrayRef<TargetInfo> TargetInfo,
+             ArrayRef<TargetRef> Targets, ArrayRef<Fixup> Fixups,
+             cas::CASID *AbbrevID = nullptr, bool IsDebugInfoBlock = false);
 };
 
 /// A symbol.
@@ -693,7 +692,8 @@ class SymbolRef : public SpecificRef<SymbolRef> {
   static Expected<SymbolRef> create(const ObjectFileSchema &Schema,
                                     Optional<NameRef> SymbolName,
                                     SymbolDefinitionRef Definition,
-                                    uint64_t Offset, Flags F);
+                                    uint64_t Offset, Flags F,
+                                    bool IsDebugInfoSymbol = false);
 
   static Expected<SymbolRef>
   create(const ObjectFileSchema &Schema, const jitlink::Symbol &S,

llvm/lib/CASObjectFormats/FlatV1.cpp

@@ -327,12 +327,12 @@ Expected<BlockRef> BlockRef::create(CompileUnitBuilder &CUB,
   if (!B)
     return B.takeError();
 
-  bool IsDebugInfoBlock = false;
   // If we are creating a cas block out of a debug_info jitlink::Block, add the
   // debug_abbrev cas block CAS ID as a refrence
   if (Block.getSection().getName() == "__DWARF,__debug_info") {
+    assert(AbbrevID &&
+           "The CAS ID for the abbrev section shouldn't be nullptr");
     B->IDs.push_back(*AbbrevID);
-    IsDebugInfoBlock = true;
   }
 
   // Encode Section.
@@ -376,9 +376,10 @@ Expected<BlockRef> BlockRef::create(CompileUnitBuilder &CUB,
     BlockSize = Content->size();
   }
   SmallString<1024> EncodeContent;
-  data::BlockData::encode(BlockSize, Block.getAlignment(),
-                          Block.getAlignmentOffset(), Content, Fixups,
-                          EncodeContent, IsDebugInfoBlock);
+  data::BlockData::encode(
+      BlockSize, Block.getAlignment(), Block.getAlignmentOffset(), Content,
+      Fixups, EncodeContent,
+      Block.getSection().getName() == "__DWARF,__debug_info");
 
   StringRef BlockData(EncodeContent);
   // Encode content first with size and data.