From b6a8c695542b2987eb9a203d5663a0740cb4725f Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Tue, 12 Oct 2021 14:18:31 -0700 Subject: [PATCH] [NFC] Rename EmitAssemblyHelper new/legacy PM methods To reflect the fact that the new PM is the default now. Differential Revision: https://reviews.llvm.org/D111680 --- clang/lib/CodeGen/BackendUtil.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 5e0ee8e..986c9e8 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -172,11 +172,16 @@ public: std::unique_ptr TM; + // Emit output using the legacy pass manager for the optimization pipeline. + // This will be removed soon when using the legacy pass manager for the + // optimization pipeline is no longer supported. + void EmitAssemblyWithLegacyPassManager(BackendAction Action, + std::unique_ptr OS); + + // Emit output using the new pass manager for the optimization pipeline. This + // is the default. void EmitAssembly(BackendAction Action, std::unique_ptr OS); - - void EmitAssemblyWithNewPassManager(BackendAction Action, - std::unique_ptr OS); }; // We need this wrapper to access LangOpts and CGOpts from extension functions @@ -966,8 +971,8 @@ bool EmitAssemblyHelper::AddEmitPasses(legacy::PassManager &CodeGenPasses, return true; } -void EmitAssemblyHelper::EmitAssembly(BackendAction Action, - std::unique_ptr OS) { +void EmitAssemblyHelper::EmitAssemblyWithLegacyPassManager( + BackendAction Action, std::unique_ptr OS) { TimeRegion Region(CodeGenOpts.TimePasses ? &CodeGenerationTime : nullptr); setCommandLineOpts(CodeGenOpts); @@ -1509,8 +1514,8 @@ void EmitAssemblyHelper::RunCodegenPipeline( /// /// This API is planned to have its functionality finished and then to replace /// `EmitAssembly` at some point in the future when the default switches. -void EmitAssemblyHelper::EmitAssemblyWithNewPassManager( - BackendAction Action, std::unique_ptr OS) { +void EmitAssemblyHelper::EmitAssembly(BackendAction Action, + std::unique_ptr OS) { TimeRegion Region(CodeGenOpts.TimePasses ? &CodeGenerationTime : nullptr); setCommandLineOpts(CodeGenOpts); @@ -1686,8 +1691,8 @@ void clang::EmitBackendOutput(DiagnosticsEngine &Diags, EmitAssemblyHelper AsmHelper(Diags, HeaderOpts, CGOpts, TOpts, LOpts, M); - if (!CGOpts.LegacyPassManager) - AsmHelper.EmitAssemblyWithNewPassManager(Action, std::move(OS)); + if (CGOpts.LegacyPassManager) + AsmHelper.EmitAssemblyWithLegacyPassManager(Action, std::move(OS)); else AsmHelper.EmitAssembly(Action, std::move(OS)); -- 2.7.4