replace the ret-override mechanisms with addInstToSpecificSourceAtom

Author: OCHyams

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -154,11 +154,14 @@ void CGDebugInfo::addInstSourceAtomMetadata(llvm::Instruction *I,
 
 void CGDebugInfo::addInstToCurrentSourceAtom(llvm::Instruction *KeyInstruction,
                                              llvm::Value *Backup) {
-  if (!CGM.getCodeGenOpts().DebugKeyInstructions)
-    return;
+  addInstToSpecificSourceAtom(KeyInstruction, Backup,
+                              KeyInstructionsInfo.CurrentAtom);
+}
 
-  uint64_t Group = KeyInstructionsInfo.CurrentAtom;
-  if (!Group)
+void CGDebugInfo::addInstToSpecificSourceAtom(llvm::Instruction *KeyInstruction,
+                                              llvm::Value *Backup,
+                                              uint64_t Group) {
+  if (!Group || !CGM.getCodeGenOpts().DebugKeyInstructions)
     return;
 
   addInstSourceAtomMetadata(KeyInstruction, Group, /*Rank=*/1);
@@ -183,31 +186,11 @@ void CGDebugInfo::addInstToCurrentSourceAtom(llvm::Instruction *KeyInstruction,
   }
 }
 
-void CGDebugInfo::addRetToOverrideOrNewSourceAtom(llvm::ReturnInst *Ret,
-                                                  llvm::Value *Backup) {
-  if (KeyInstructionsInfo.RetAtomOverride) {
-    uint64_t CurrentAtom = KeyInstructionsInfo.CurrentAtom;
-    KeyInstructionsInfo.CurrentAtom = KeyInstructionsInfo.RetAtomOverride;
-    addInstToCurrentSourceAtom(Ret, Backup);
-    KeyInstructionsInfo.CurrentAtom = CurrentAtom;
-    KeyInstructionsInfo.RetAtomOverride = 0;
-  } else {
-    auto Grp = ApplyAtomGroup(this);
-    addInstToCurrentSourceAtom(Ret, Backup);
-  }
-}
-
-void CGDebugInfo::setRetInstSourceAtomOverride(uint64_t Group) {
-  assert(KeyInstructionsInfo.RetAtomOverride == 0);
-  KeyInstructionsInfo.RetAtomOverride = Group;
-}
-
 void CGDebugInfo::completeFunction() {
   // Reset the atom group number tracker as the numbers are function-local.
   KeyInstructionsInfo.NextAtom = 1;
   KeyInstructionsInfo.HighestEmittedAtom = 0;
   KeyInstructionsInfo.CurrentAtom = 0;
-  KeyInstructionsInfo.RetAtomOverride = 0;
 }
 
 ApplyAtomGroup::ApplyAtomGroup(CGDebugInfo *DI) : DI(DI) {

clang/lib/CodeGen/CGDebugInfo.h

@@ -188,7 +188,6 @@ class CGDebugInfo {
     uint64_t NextAtom = 1;
     uint64_t HighestEmittedAtom = 0;
     uint64_t CurrentAtom = 0;
-    uint64_t RetAtomOverride = 0;
   } KeyInstructionsInfo;
 
 private:
@@ -664,13 +663,10 @@ class CGDebugInfo {
   void addInstToCurrentSourceAtom(llvm::Instruction *KeyInstruction,
                                   llvm::Value *Backup);
 
-  /// Add \p Ret and an optional \p Backup instruction to the
-  /// saved override used for some ret instructions if it exists, or a new atom.
-  void addRetToOverrideOrNewSourceAtom(llvm::ReturnInst *Ret,
-                                       llvm::Value *Backup);
-
-  /// Set an atom group override for use in addRetToOverrideOrNewSourceAtom.
-  void setRetInstSourceAtomOverride(uint64_t Group);
+  /// Add \p KeyInstruction and an optional \p Backup instruction to the atom
+  /// group \p Atom.
+  void addInstToSpecificSourceAtom(llvm::Instruction *KeyInstruction,
+                                   llvm::Value *Backup, uint64_t Atom);
 
 private:
   /// Amend \p I's DebugLoc with \p Group (its source atom group) and \p

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -3333,8 +3333,8 @@ void CodeGenFunction::addInstToCurrentSourceAtom(
     DI->addInstToCurrentSourceAtom(KeyInstruction, Backup);
 }
 
-void CodeGenFunction::addRetToOverrideOrNewSourceAtom(llvm::ReturnInst *Ret,
-                                                      llvm::Value *Backup) {
+void CodeGenFunction::addInstToSpecificSourceAtom(
+    llvm::Instruction *KeyInstruction, llvm::Value *Backup, uint64_t Atom) {
   if (CGDebugInfo *DI = getDebugInfo())
-    DI->addRetToOverrideOrNewSourceAtom(Ret, Backup);
+    DI->addInstToSpecificSourceAtom(KeyInstruction, Backup, Atom);
 }

clang/lib/CodeGen/CodeGenFunction.h

@@ -1744,9 +1744,9 @@ class CodeGenFunction : public CodeGenTypeCache {
   void addInstToCurrentSourceAtom(llvm::Instruction *KeyInstruction,
                                   llvm::Value *Backup);
 
-  /// See CGDebugInfo::addRetToOverrideOrNewSourceAtom.
-  void addRetToOverrideOrNewSourceAtom(llvm::ReturnInst *Ret,
-                                       llvm::Value *Backup);
+  /// See CGDebugInfo::addInstToSpecificSourceAtom.
+  void addInstToSpecificSourceAtom(llvm::Instruction *KeyInstruction,
+                                   llvm::Value *Backup, uint64_t Atom);
 
 private:
   /// SwitchInsn - This is nearest current switch instruction. It is null if