[llvm] 26921d7 - [NewPM] Fix callsite for x86-lvi-ret (#179383)

[via llvm-commits]

Author: Anshul Nigham
Date: 2026-02-02T21:05:04-08:00
New Revision: 26921d74efb8a914f02a0e55b03ac04366bf94a6

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

LOG: [NewPM] Fix callsite for x86-lvi-ret (#179383)

Added: 
    

Modified: 
    llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
    llvm/test/CodeGen/X86/llc-pipeline-npm.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp b/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
index 74256b13ecf6b..41f63bfd3651f 100644
--- a/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
@@ -158,7 +158,8 @@ void X86CodeGenPassBuilder::addPostRegAlloc(PassManagerWrapper &PMW) const {
   // mitigation. This is to prevent slow downs due to
   // analyses needed by the LVIHardening pass when compiling at -O0.
   if (getOptLevel() != CodeGenOptLevel::None) {
-    addMachineFunctionPass(X86LoadValueInjectionRetHardeningPass(), PMW);
+    // TODO(nigham): Add X86LoadValueInjectionLoadHardeningPass here once
+    // it has been ported.
   }
 }
 
@@ -234,8 +235,7 @@ void X86CodeGenPassBuilder::addPreEmitPass2(PassManagerWrapper &PMW) const {
     // ported.
   }
 
-  // TODO(boomanaiden154): Add X86LoadValueInjectionRetHardeningPass here once
-  // it has been ported.
+  addMachineFunctionPass(X86LoadValueInjectionRetHardeningPass(), PMW);
 
   // Insert pseudo probe annotation for callsite profiling
   // TODO(boomanaiden154): Add PseudoProberInserterPass here once it has been

diff  --git a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
index 3f3a992b1b23f..a2bada57d8ff7 100644
--- a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
+++ b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
@@ -64,6 +64,7 @@
 ; O0-NEXT: stack-frame-layout
 ; O0-NEXT: x86-seses
 ; O0-NEXT: x86-return-thunks
+; O0-NEXT: x86-lvi-ret
 ; O0-NEXT: verify)
 ; O0-NEXT: free-machine-function)
 
@@ -144,7 +145,6 @@
 ; O2-NEXT: machinelicm
 ; O2-NEXT: x86-lower-tile-copy
 ; O2-NEXT: x86-fp-stackifier
-; O2-NEXT: x86-lvi-ret
 ; O2-NEXT: remove-redundant-debug-values
 ; O2-NEXT: fixup-statepoint-caller-saved
 ; O2-NEXT: postra-machine-sink
@@ -175,6 +175,7 @@
 ; O2-NEXT: stack-frame-layout
 ; O2-NEXT: x86-seses
 ; O2-NEXT: x86-return-thunks
+; O2-NEXT: x86-lvi-ret
 ; O2-NEXT: verify)
 ; O2-NEXT: free-machine-function)
 
@@ -235,6 +236,7 @@
 ; O0-WINDOWS-NEXT: x86-seses
 ; O0-WINDOWS-NEXT: x86-return-thunks
 ; O0-WINDOWS-NEXT: x86-avoid-trailing-call
+; O0-WINDOWS-NEXT: x86-lvi-ret
 ; O0-WINDOWS-NEXT: x86-wineh-unwindv2
 ; O0-WINDOWS-NEXT: verify)
 ; O0-WINDOWS-NEXT: free-machine-function)
@@ -318,7 +320,6 @@
 ; O3-WINDOWS-NEXT: machinelicm
 ; O3-WINDOWS-NEXT: x86-lower-tile-copy
 ; O3-WINDOWS-NEXT: x86-fp-stackifier
-; O3-WINDOWS-NEXT: x86-lvi-ret
 ; O3-WINDOWS-NEXT: remove-redundant-debug-values
 ; O3-WINDOWS-NEXT: fixup-statepoint-caller-saved
 ; O3-WINDOWS-NEXT: postra-machine-sink
@@ -350,6 +351,7 @@
 ; O3-WINDOWS-NEXT: x86-seses
 ; O3-WINDOWS-NEXT: x86-return-thunks
 ; O3-WINDOWS-NEXT: x86-avoid-trailing-call
+; O3-WINDOWS-NEXT: x86-lvi-ret
 ; O3-WINDOWS-NEXT: x86-wineh-unwindv2
 ; O3-WINDOWS-NEXT: verify)
 ; O3-WINDOWS-NEXT: free-machine-function)