[llvm-branch-commits] [llvm] [X86] Port X86IndirectThunks to NewPM (PR #238487)

Aiden Grossman via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Tue Nov 3 10:54:36 PST 2026


https://github.com/boomanaiden154 updated https://github.com/llvm/llvm-project/pull/238487

>From eaf6ec15af39bd18ce136531cc57faa2b3f5162d Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Tue, 3 Nov 2026 18:54:24 +0000
Subject: [PATCH] finish

Created using spr 1.3.7
---
 llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp | 3 +--
 llvm/lib/Target/X86/X86PassRegistry.def       | 1 +
 llvm/test/CodeGen/X86/llc-pipeline-npm.ll     | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp b/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
index 2ca5e42c4a9cd5..f4c97fa50fe71c 100644
--- a/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp
@@ -286,8 +286,7 @@ void X86CodeGenPassBuilder::addPreEmitPass2(PassManagerWrapper &PMW) {
   // hand inspection of the codegen output.
   addMachineFunctionPass(X86SpeculativeExecutionSideEffectSuppressionPass(),
                          PMW);
-  // TODO(boomanaiden154): Add X86IndirectThunksPass here
-  // once it has been ported.
+  addMachineFunctionPass(X86IndirectThunksPass(), PMW);
   addMachineFunctionPass(X86ReturnThunksPass(), PMW);
 
   // Insert extra int3 instructions after trailing call instructions to avoid
diff --git a/llvm/lib/Target/X86/X86PassRegistry.def b/llvm/lib/Target/X86/X86PassRegistry.def
index 01f6745095947e..06343023322069 100644
--- a/llvm/lib/Target/X86/X86PassRegistry.def
+++ b/llvm/lib/Target/X86/X86PassRegistry.def
@@ -54,6 +54,7 @@ MACHINE_FUNCTION_PASS("x86-flags-copy-lowering", X86FlagsCopyLoweringPass())
 MACHINE_FUNCTION_PASS("x86-fp-stackifier", X86FPStackifierPass())
 MACHINE_FUNCTION_PASS("x86-global-base-reg", X86GlobalBaseRegPass())
 MACHINE_FUNCTION_PASS("x86-indirect-branch-tracking", X86IndirectBranchTrackingPass())
+MACHINE_FUNCTION_PASS("x86-indirect-thunks", X86IndirectThunksPass())
 MACHINE_FUNCTION_PASS("x86-insert-vzeroupper", X86InsertVZeroUpperPass())
 MACHINE_FUNCTION_PASS("x86-insert-x87-wait", X86InsertX87WaitPass())
 MACHINE_FUNCTION_PASS("x86-isel", X86ISelDAGToDAGPass(*this))
diff --git a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
index 44f14931a081dc..c400ab1da6005d 100644
--- a/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
+++ b/llvm/test/CodeGen/X86/llc-pipeline-npm.ll
@@ -75,6 +75,7 @@
 ; O0-NEXT:     machine-sanmd
 ; O0-NEXT:     stack-frame-layout
 ; O0-NEXT:     x86-seses
+; O0-NEXT:     x86-indirect-thunks
 ; O0-NEXT:     x86-return-thunks
 ; O0-NEXT:     cfi-instr-inserter
 ; O0-NEXT:     x86-lvi-ret
@@ -208,6 +209,7 @@
 ; O2-NEXT:     machine-sanmd
 ; O2-NEXT:     stack-frame-layout
 ; O2-NEXT:     x86-seses
+; O2-NEXT:     x86-indirect-thunks
 ; O2-NEXT:     x86-return-thunks
 ; O2-NEXT:     cfi-instr-inserter
 ; O2-NEXT:     x86-lvi-ret
@@ -285,6 +287,7 @@
 ; O0-WINDOWS-NEXT:     machine-sanmd
 ; O0-WINDOWS-NEXT:     stack-frame-layout
 ; O0-WINDOWS-NEXT:     x86-seses
+; O0-WINDOWS-NEXT:     x86-indirect-thunks
 ; O0-WINDOWS-NEXT:     x86-return-thunks
 ; O0-WINDOWS-NEXT:     x86-avoid-trailing-call
 ; O0-WINDOWS-NEXT:     cfi-instr-inserter
@@ -423,6 +426,7 @@
 ; O3-WINDOWS-NEXT:     machine-sanmd
 ; O3-WINDOWS-NEXT:     stack-frame-layout
 ; O3-WINDOWS-NEXT:     x86-seses
+; O3-WINDOWS-NEXT:     x86-indirect-thunks
 ; O3-WINDOWS-NEXT:     x86-return-thunks
 ; O3-WINDOWS-NEXT:     x86-avoid-trailing-call
 ; O3-WINDOWS-NEXT:     cfi-instr-inserter



More information about the llvm-branch-commits mailing list