From 6b31e63bc31b85a2969b69da8c36ff0526e0d8b1 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 24 Jun 2023 07:33:50 -0700 Subject: [PATCH] [LegacyPM] Remove RewriteSymbolsLegacyPass Differential Revision: https://reviews.llvm.org/D153679 --- llvm/include/llvm/InitializePasses.h | 1 - llvm/include/llvm/LinkAllPasses.h | 1 - .../llvm/Transforms/Utils/SymbolRewriter.h | 3 -- llvm/lib/Transforms/Utils/SymbolRewriter.cpp | 43 ------------------- llvm/tools/opt/opt.cpp | 1 - 5 files changed, 49 deletions(-) diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h index 108de472e9081..c6fee47b464b9 100644 --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -287,7 +287,6 @@ void initializeRemoveRedundantDebugValuesPass(PassRegistry&); void initializeRenameIndependentSubregsPass(PassRegistry&); void initializeReplaceWithVeclibLegacyPass(PassRegistry &); void initializeResetMachineFunctionPass(PassRegistry&); -void initializeRewriteSymbolsLegacyPassPass(PassRegistry&); void initializeSCEVAAWrapperPassPass(PassRegistry&); void initializeSROALegacyPassPass(PassRegistry&); void initializeSafeStackLegacyPassPass(PassRegistry&); diff --git a/llvm/include/llvm/LinkAllPasses.h b/llvm/include/llvm/LinkAllPasses.h index 7dd41b86700d4..7420ea64e9543 100644 --- a/llvm/include/llvm/LinkAllPasses.h +++ b/llvm/include/llvm/LinkAllPasses.h @@ -154,7 +154,6 @@ namespace { (void) llvm::createSeparateConstOffsetFromGEPPass(); (void) llvm::createSpeculativeExecutionPass(); (void) llvm::createSpeculativeExecutionIfHasBranchDivergencePass(); - (void) llvm::createRewriteSymbolsPass(); (void) llvm::createStraightLineStrengthReducePass(); (void)llvm::createScalarizeMaskedMemIntrinLegacyPass(); (void) llvm::createHardwareLoopsLegacyPass(); diff --git a/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h b/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h index 1c6f90faf2b40..80dc6a42d9311 100644 --- a/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h +++ b/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h @@ -114,9 +114,6 @@ class RewriteMapParser { } // end namespace SymbolRewriter -ModulePass *createRewriteSymbolsPass(); -ModulePass *createRewriteSymbolsPass(SymbolRewriter::RewriteDescriptorList &); - class RewriteSymbolPass : public PassInfoMixin { public: RewriteSymbolPass() { loadAndParseMapFiles(); } diff --git a/llvm/lib/Transforms/Utils/SymbolRewriter.cpp b/llvm/lib/Transforms/Utils/SymbolRewriter.cpp index 4ad16d622e8d1..c3ae43e567b01 100644 --- a/llvm/lib/Transforms/Utils/SymbolRewriter.cpp +++ b/llvm/lib/Transforms/Utils/SymbolRewriter.cpp @@ -517,37 +517,6 @@ parseRewriteGlobalAliasDescriptor(yaml::Stream &YS, yaml::ScalarNode *K, return true; } -namespace { - -class RewriteSymbolsLegacyPass : public ModulePass { -public: - static char ID; // Pass identification, replacement for typeid - - RewriteSymbolsLegacyPass(); - RewriteSymbolsLegacyPass(SymbolRewriter::RewriteDescriptorList &DL); - - bool runOnModule(Module &M) override; - -private: - RewriteSymbolPass Impl; -}; - -} // end anonymous namespace - -char RewriteSymbolsLegacyPass::ID = 0; - -RewriteSymbolsLegacyPass::RewriteSymbolsLegacyPass() : ModulePass(ID) { - initializeRewriteSymbolsLegacyPassPass(*PassRegistry::getPassRegistry()); -} - -RewriteSymbolsLegacyPass::RewriteSymbolsLegacyPass( - SymbolRewriter::RewriteDescriptorList &DL) - : ModulePass(ID), Impl(DL) {} - -bool RewriteSymbolsLegacyPass::runOnModule(Module &M) { - return Impl.runImpl(M); -} - PreservedAnalyses RewriteSymbolPass::run(Module &M, ModuleAnalysisManager &AM) { if (!runImpl(M)) return PreservedAnalyses::all(); @@ -572,15 +541,3 @@ void RewriteSymbolPass::loadAndParseMapFiles() { for (const auto &MapFile : MapFiles) Parser.parse(MapFile, &Descriptors); } - -INITIALIZE_PASS(RewriteSymbolsLegacyPass, "rewrite-symbols", "Rewrite Symbols", - false, false) - -ModulePass *llvm::createRewriteSymbolsPass() { - return new RewriteSymbolsLegacyPass(); -} - -ModulePass * -llvm::createRewriteSymbolsPass(SymbolRewriter::RewriteDescriptorList &DL) { - return new RewriteSymbolsLegacyPass(DL); -} diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index a9248efa189fc..5e1e221a5dcbe 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -434,7 +434,6 @@ int main(int argc, char **argv) { initializeCallBrPreparePass(Registry); initializeCodeGenPreparePass(Registry); initializeAtomicExpandPass(Registry); - initializeRewriteSymbolsLegacyPassPass(Registry); initializeWinEHPreparePass(Registry); initializeDwarfEHPrepareLegacyPassPass(Registry); initializeSafeStackLegacyPassPass(Registry);