diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -287,7 +287,6 @@ 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 --- a/llvm/include/llvm/LinkAllPasses.h +++ b/llvm/include/llvm/LinkAllPasses.h @@ -154,7 +154,6 @@ (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 --- a/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h +++ b/llvm/include/llvm/Transforms/Utils/SymbolRewriter.h @@ -114,9 +114,6 @@ } // 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 --- a/llvm/lib/Transforms/Utils/SymbolRewriter.cpp +++ b/llvm/lib/Transforms/Utils/SymbolRewriter.cpp @@ -517,37 +517,6 @@ 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 @@ 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 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -434,7 +434,6 @@ initializeCallBrPreparePass(Registry); initializeCodeGenPreparePass(Registry); initializeAtomicExpandPass(Registry); - initializeRewriteSymbolsLegacyPassPass(Registry); initializeWinEHPreparePass(Registry); initializeDwarfEHPrepareLegacyPassPass(Registry); initializeSafeStackLegacyPassPass(Registry);