Skip to content

PassWrapper: handle LLVM 24 change in function types #161098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 3 commits into from
Aug 25, 2026
+40 −7
Merged

PassWrapper: handle LLVM 24 change in function types #161098

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
299213f
PassWrapper: handle LLVM 24 change in function types
durin42 Aug 14, 2026
50b867f
PassWrapper: clang-format
durin42 Aug 14, 2026
1f7f241
Fix whitespace.
durin42 Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 40 additions & 7 deletions compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,17 @@ extern "C" typedef void (*LLVMRustSelfProfileBeforePassCallback)(
extern "C" typedef void (*LLVMRustSelfProfileAfterPassCallback)(
void *); // LlvmSelfProfiler

#if LLVM_VERSION_GE(24, 0)
std::string LLVMRustwrappedIrGetName(const llvm::IRUnitRef &WrappedIr) {
if (const auto *Cast = dyn_cast<Module>(WrappedIr))
return Cast->getName().str();
if (const auto *Cast = dyn_cast<Function>(WrappedIr))
return Cast->getName().str();
if (const auto *Cast = dyn_cast<Loop>(WrappedIr))
return Cast->getName().str();
if (const auto *Cast = dyn_cast<LazyCallGraph::SCC>(WrappedIr))
return Cast->getName();
#else
std::string LLVMRustwrappedIrGetName(const llvm::Any &WrappedIr) {
if (const auto *Cast = any_cast<const Module *>(&WrappedIr))
return (*Cast)->getName().str();
Expand All @@ -532,6 +543,7 @@ std::string LLVMRustwrappedIrGetName(const llvm::Any &WrappedIr) {
return (*Cast)->getName().str();
if (const auto *Cast = any_cast<const LazyCallGraph::SCC *>(&WrappedIr))
return (*Cast)->getName();
#endif
return "<UNKNOWN>";
}

Expand All @@ -540,15 +552,26 @@ void LLVMSelfProfileInitializeCallbacks(
LLVMRustSelfProfileBeforePassCallback BeforePassCallback,
LLVMRustSelfProfileAfterPassCallback AfterPassCallback) {
PIC.registerBeforeNonSkippedPassCallback(
#if LLVM_VERSION_GE(24, 0)
[LlvmSelfProfiler, BeforePassCallback](StringRef Pass,
llvm::IRUnitRef Ir) {
#else
[LlvmSelfProfiler, BeforePassCallback](StringRef Pass, llvm::Any Ir) {
#endif
std::string PassName = Pass.str();
std::string IrName = LLVMRustwrappedIrGetName(Ir);
BeforePassCallback(LlvmSelfProfiler, PassName.c_str(), IrName.c_str());
});

PIC.registerAfterPassCallback(
#if LLVM_VERSION_GE(24, 0)
[LlvmSelfProfiler,
AfterPassCallback](StringRef Pass, llvm::IRUnitRef IR,
const PreservedAnalyses &Preserved) {
#else
[LlvmSelfProfiler, AfterPassCallback](
StringRef Pass, llvm::Any IR, const PreservedAnalyses &Preserved) {
#endif
AfterPassCallback(LlvmSelfProfiler);
});

Expand All @@ -558,17 +581,27 @@ void LLVMSelfProfileInitializeCallbacks(
AfterPassCallback(LlvmSelfProfiler);
});

Comment thread
durin42 marked this conversation as resolved.
#if LLVM_VERSION_GE(24, 0)
PIC.registerBeforeAnalysisCallback([LlvmSelfProfiler, BeforePassCallback](
StringRef Pass, llvm::IRUnitRef Ir) {
#else
PIC.registerBeforeAnalysisCallback(
[LlvmSelfProfiler, BeforePassCallback](StringRef Pass, llvm::Any Ir) {
std::string PassName = Pass.str();
std::string IrName = LLVMRustwrappedIrGetName(Ir);
BeforePassCallback(LlvmSelfProfiler, PassName.c_str(), IrName.c_str());
});

#endif
std::string PassName = Pass.str();
std::string IrName = LLVMRustwrappedIrGetName(Ir);
BeforePassCallback(LlvmSelfProfiler, PassName.c_str(), IrName.c_str());
});

#if LLVM_VERSION_GE(24, 0)
PIC.registerAfterAnalysisCallback([LlvmSelfProfiler, AfterPassCallback](
StringRef Pass, llvm::IRUnitRef Ir) {
#else
PIC.registerAfterAnalysisCallback(
[LlvmSelfProfiler, AfterPassCallback](StringRef Pass, llvm::Any Ir) {
AfterPassCallback(LlvmSelfProfiler);
});
#endif
AfterPassCallback(LlvmSelfProfiler);
});
}

enum class LLVMRustOptStage {
Expand Down
Loading