Skip to content

[libspirv] Fix function erase order in LibclcRemangler post-processing #20942

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

Open
wenju-he wants to merge 2 commits into
base: sycl
Choose a base branch
from
+5 −1
Open

[libspirv] Fix function erase order in LibclcRemangler post-processing #20942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c25cf89
[libspirv] Fix function erase order in LibclcRemangler post-processing
wenju-he Dec 19, 2025
b251393
Clear old function name to unblock setName() in tmp-suffix cleanup
wenju-he Dec 20, 2025
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
6 changes: 5 additions & 1 deletion libclc/utils/libclc-remangler/LibclcRemangler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,7 @@ class LibCLCRemangler : public ASTConsumer {
void postProcessRemoveTmpSuffix(llvm::Module *M) {
if (TestRun)
return;
std::vector<Function *> ToErase;
for (auto &F : make_early_inc_range(*M)) {
StringRef Name = F.getName();
if (!Name.consume_back(TmpSuffix))
Expand All @@ -976,7 +977,8 @@ class LibCLCRemangler : public ASTConsumer {
if (RenamedFunctions.count(Name.str())) {
// Drop unuseful clone of the original or remangled function.
Func->replaceAllUsesWith(ConstantPointerNull::get(Func->getType()));
Func->eraseFromParent();
Func->setName("");
ToErase.push_back(Func);
} else {
// Name doesn't exist in the original module. Drop unuseful clone of
// remangled function.
Expand All @@ -987,6 +989,8 @@ class LibCLCRemangler : public ASTConsumer {
// Complete the mangling process, e.g. from _Z1fPU3AS4i to _Z1fPi.
F.setName(Name);
}
for (auto *F : ToErase)
F->eraseFromParent();
}

void handleModule(llvm::Module *M) {
Expand Down