[llvm] a614f2b - [StackProtector] Fix domtree verification in NewPM

[Nikita Popov via llvm-commits]

Author: Nikita Popov
Date: 2025-03-05T12:55:27+01:00
New Revision: a614f2b489caa19001b2f44784514a6226f79cb7

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

LOG: [StackProtector] Fix domtree verification in NewPM

Use DTU.getDomTree() to make sure the DTU if flushed.

Added: 
    

Modified: 
    llvm/lib/CodeGen/StackProtector.cpp
    llvm/test/CodeGen/X86/stack-protector-atomicrmw-xchg.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp
index 8aa3f9d4f465a..efa790c2e4be9 100644
--- a/llvm/lib/CodeGen/StackProtector.cpp
+++ b/llvm/lib/CodeGen/StackProtector.cpp
@@ -136,7 +136,8 @@ PreservedAnalyses StackProtectorPass::run(Function &F,
   bool Changed = InsertStackProtectors(TM, &F, DT ? &DTU : nullptr,
                                        Info.HasPrologue, Info.HasIRCheck);
 #ifdef EXPENSIVE_CHECKS
-  assert((!DT || DT->verify(DominatorTree::VerificationLevel::Full)) &&
+  assert((!DT ||
+          DTU.getDomTree().verify(DominatorTree::VerificationLevel::Full)) &&
          "Failed to maintain validity of domtree!");
 #endif
 

diff  --git a/llvm/test/CodeGen/X86/stack-protector-atomicrmw-xchg.ll b/llvm/test/CodeGen/X86/stack-protector-atomicrmw-xchg.ll
index ed631fae853e4..486cb4cfa509d 100644
--- a/llvm/test/CodeGen/X86/stack-protector-atomicrmw-xchg.ll
+++ b/llvm/test/CodeGen/X86/stack-protector-atomicrmw-xchg.ll
@@ -1,5 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
 ; RUN: opt -S -mtriple=x86_64-unknown-linux-gnu -passes=stack-protector < %s | FileCheck %s
+; RUN: opt -S -mtriple=x86_64-unknown-linux-gnu -passes='require<domtree>,stack-protector' < %s | FileCheck %s
 
 define void @atomicrmw_xchg(ptr %p) sspstrong {
 ; CHECK-LABEL: define void @atomicrmw_xchg(