[llvm] 2953d9c - Reapply "[RemoveDIs] Add additional debug-mode verifier checks" (#84757)

[Orlando Cazalet-Hyams via llvm-commits]

Author: Orlando Cazalet-Hyams
Date: 2024-03-10T20:54:40Z
New Revision: 2953d9c8b07e07d1344b979ebd831a68b07d0e8f

URL: https://github.com/llvm/llvm-project/commit/2953d9c8b07e07d1344b979ebd831a68b07d0e8f
DIFF: https://github.com/llvm/llvm-project/commit/2953d9c8b07e07d1344b979ebd831a68b07d0e8f.diff

LOG: Reapply "[RemoveDIs] Add additional debug-mode verifier checks" (#84757)

Test failures fixed in d0117b71193787ebfd92d96a4ecc261f0aaeac86

Added: 
    

Modified: 
    llvm/lib/IR/Verifier.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index ce090c3b8a7444..0e6c01802cfb8c 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -2691,6 +2691,11 @@ void Verifier::visitFunction(const Function &F) {
   Check(verifyAttributeCount(Attrs, FT->getNumParams()),
         "Attribute after last parameter!", &F);
 
+  CheckDI(F.IsNewDbgInfoFormat == F.getParent()->IsNewDbgInfoFormat,
+          "Function debug format should match parent module", &F,
+          F.IsNewDbgInfoFormat, F.getParent(),
+          F.getParent()->IsNewDbgInfoFormat);
+
   bool IsIntrinsic = F.isIntrinsic();
 
   // Check function attributes.
@@ -3034,6 +3039,11 @@ void Verifier::visitBasicBlock(BasicBlock &BB) {
     Check(I.getParent() == &BB, "Instruction has bogus parent pointer!");
   }
 
+  CheckDI(BB.IsNewDbgInfoFormat == BB.getParent()->IsNewDbgInfoFormat,
+          "BB debug format should match parent function", &BB,
+          BB.IsNewDbgInfoFormat, BB.getParent(),
+          BB.getParent()->IsNewDbgInfoFormat);
+
   // Confirm that no issues arise from the debug program.
   if (BB.IsNewDbgInfoFormat)
     CheckDI(!BB.getTrailingDPValues(), "Basic Block has trailing DbgRecords!",