Author: Simon Pilgrim Date: 2022-03-15T13:01:35Z New Revision: 7262eacd41997d7ca262d83367e28998662c1b21
URL: https://github.com/llvm/llvm-project/commit/7262eacd41997d7ca262d83367e28998662c1b21 DIFF: https://github.com/llvm/llvm-project/commit/7262eacd41997d7ca262d83367e28998662c1b21.diff LOG: Revert rG9c542a5a4e1ba36c24e48185712779df52b7f7a6 "Lower `@llvm.global_dtors` using `__cxa_atexit` on MachO" Mane of the build bots are complaining: Unknown command line argument '-lower-global-dtors' Added: llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp Modified: clang/lib/CodeGen/BackendUtil.cpp llvm/docs/Passes.rst llvm/include/llvm/CodeGen/CommandFlags.h llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h llvm/include/llvm/InitializePasses.h llvm/include/llvm/LinkAllPasses.h llvm/include/llvm/Target/TargetOptions.h llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h llvm/include/llvm/Transforms/Utils.h llvm/lib/CodeGen/CodeGen.cpp llvm/lib/CodeGen/CommandFlags.cpp llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp llvm/lib/CodeGen/TargetPassConfig.cpp llvm/lib/Passes/PassBuilder.cpp llvm/lib/Passes/PassRegistry.def llvm/lib/Target/WebAssembly/CMakeLists.txt llvm/lib/Target/WebAssembly/WebAssembly.h llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp llvm/lib/Transforms/Utils/CMakeLists.txt llvm/test/CodeGen/ARM/ctors_dtors.ll llvm/test/CodeGen/X86/2011-08-29-InitOrder.ll Removed: llvm/include/llvm/Transforms/Utils/LowerGlobalDtors.h llvm/lib/Transforms/Utils/LowerGlobalDtors.cpp llvm/test/Transforms/LowerGlobalDestructors/lower-global-dtors.ll ################################################################################ diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 716a565ee7871..490f5b3de1ff3 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -546,8 +546,6 @@ static bool initTargetOptions(DiagnosticsEngine &Diags, Options.BinutilsVersion = llvm::TargetMachine::parseBinutilsVersion(CodeGenOpts.BinutilsVersion); Options.UseInitArray = CodeGenOpts.UseInitArray; - Options.LowerGlobalDtorsViaCxaAtExit = - CodeGenOpts.RegisterGlobalDtorsWithAtExit; Options.DisableIntegratedAS = CodeGenOpts.DisableIntegratedAS; Options.CompressDebugSections = CodeGenOpts.getCompressDebugSections(); Options.RelaxELFRelocations = CodeGenOpts.RelaxELFRelocations; diff --git a/llvm/docs/Passes.rst b/llvm/docs/Passes.rst index 7c0666992e8f5..92f06496b4ef9 100644 --- a/llvm/docs/Passes.rst +++ b/llvm/docs/Passes.rst @@ -876,14 +876,6 @@ This pass expects :ref:`LICM <passes-licm>` to be run before it to hoist invariant conditions out of the loop, to make the unswitching opportunity obvious. -``-lower-global-dtors``: Lower global destructors ------------------------------------------------------------- - -This pass lowers global module destructors (``llvm.global_dtors``) by creating -wrapper functions that are registered as global constructors in -``llvm.global_ctors`` and which contain a call to ``__cxa_atexit`` to register -their destructor functions. - ``-loweratomic``: Lower atomic intrinsics to non-atomic form ------------------------------------------------------------ diff --git a/llvm/include/llvm/CodeGen/CommandFlags.h b/llvm/include/llvm/CodeGen/CommandFlags.h index 4424db4aa2e41..aa91367f65b80 100644 --- a/llvm/include/llvm/CodeGen/CommandFlags.h +++ b/llvm/include/llvm/CodeGen/CommandFlags.h @@ -95,8 +95,6 @@ std::string getTrapFuncName(); bool getUseCtors(); -bool getLowerGlobalDtorsViaCxaAtExit(); - bool getRelaxELFRelocations(); bool getDataSections(); diff --git a/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h b/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h index 26bda8d5d239d..2a35987507446 100644 --- a/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h +++ b/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h @@ -119,9 +119,6 @@ class TargetLoweringObjectFileMachO : public TargetLoweringObjectFile { void Initialize(MCContext &Ctx, const TargetMachine &TM) override; - MCSection *getStaticDtorSection(unsigned Priority, - const MCSymbol *KeySym) const override; - /// Emit the module flags that specify the garbage collection information. void emitModuleMetadata(MCStreamer &Streamer, Module &M) const override; diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h index 82aafe2744184..3a98bacef81d0 100644 --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -274,7 +274,6 @@ void initializeLowerAtomicLegacyPassPass(PassRegistry&); void initializeLowerConstantIntrinsicsPass(PassRegistry&); void initializeLowerEmuTLSPass(PassRegistry&); void initializeLowerExpectIntrinsicPass(PassRegistry&); -void initializeLowerGlobalDtorsLegacyPassPass(PassRegistry &); void initializeLowerGuardIntrinsicLegacyPassPass(PassRegistry&); void initializeLowerWidenableConditionLegacyPassPass(PassRegistry&); void initializeLowerIntrinsicsPass(PassRegistry&); diff --git a/llvm/include/llvm/LinkAllPasses.h b/llvm/include/llvm/LinkAllPasses.h index df832d5da05a3..bd8bea6b99a06 100644 --- a/llvm/include/llvm/LinkAllPasses.h +++ b/llvm/include/llvm/LinkAllPasses.h @@ -145,7 +145,6 @@ namespace { (void) llvm::createLoopRotatePass(); (void) llvm::createLowerConstantIntrinsicsPass(); (void) llvm::createLowerExpectIntrinsicPass(); - (void) llvm::createLowerGlobalDtorsLegacyPass(); (void) llvm::createLowerInvokePass(); (void) llvm::createLowerSwitchPass(); (void) llvm::createNaryReassociatePass(); diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h index 8017e39c941ba..4ced520a16a24 100644 --- a/llvm/include/llvm/Target/TargetOptions.h +++ b/llvm/include/llvm/Target/TargetOptions.h @@ -130,13 +130,12 @@ namespace llvm { HonorSignDependentRoundingFPMathOption(false), NoZerosInBSS(false), GuaranteedTailCallOpt(false), StackSymbolOrdering(true), EnableFastISel(false), EnableGlobalISel(false), UseInitArray(false), - LowerGlobalDtorsViaCxaAtExit(false), DisableIntegratedAS(false), - RelaxELFRelocations(false), FunctionSections(false), - DataSections(false), IgnoreXCOFFVisibility(false), - XCOFFTracebackTable(true), UniqueSectionNames(true), - UniqueBasicBlockSectionNames(false), TrapUnreachable(false), - NoTrapAfterNoreturn(false), TLSSize(0), EmulatedTLS(false), - ExplicitEmulatedTLS(false), EnableIPRA(false), + DisableIntegratedAS(false), RelaxELFRelocations(false), + FunctionSections(false), DataSections(false), + IgnoreXCOFFVisibility(false), XCOFFTracebackTable(true), + UniqueSectionNames(true), UniqueBasicBlockSectionNames(false), + TrapUnreachable(false), NoTrapAfterNoreturn(false), TLSSize(0), + EmulatedTLS(false), ExplicitEmulatedTLS(false), EnableIPRA(false), EmitStackSizeSection(false), EnableMachineOutliner(false), EnableMachineFunctionSplitter(false), SupportsDefaultOutlining(false), EmitAddrsig(false), EmitCallSiteInfo(false), @@ -246,10 +245,6 @@ namespace llvm { /// constructors. unsigned UseInitArray : 1; - /// Use __cxa_atexit to register global destructors; determines how - /// llvm.global_dtors is lowered. - unsigned LowerGlobalDtorsViaCxaAtExit : 1; - /// Disable the integrated assembler. unsigned DisableIntegratedAS : 1; diff --git a/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h b/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h index 107f5af3eebaa..f019d1c00a358 100644 --- a/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h +++ b/llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h @@ -17,6 +17,7 @@ enum class AsanDtorKind { None, ///< Do not emit any destructors for ASan Global, ///< Append to llvm.global_dtors Invalid, ///< Not a valid destructor Kind. + // TODO(dliew): Add more more kinds. }; /// Mode of ASan detect stack use after return diff --git a/llvm/include/llvm/Transforms/Utils.h b/llvm/include/llvm/Transforms/Utils.h index ebd4bd3185733..1e9c0a040ad2b 100644 --- a/llvm/include/llvm/Transforms/Utils.h +++ b/llvm/include/llvm/Transforms/Utils.h @@ -155,12 +155,6 @@ FunctionPass *createAssumeSimplifyPass(); // don't block SCEV. // Pass *createCanonicalizeFreezeInLoopsPass(); - -//===----------------------------------------------------------------------===// -// LowerGlobalDtorsLegacy - Lower @llvm.global_dtors by creating wrapper -// functions that are registered in @llvm.global_ctors and which contain a call -// to `__cxa_atexit` to register their destructor functions. -ModulePass *createLowerGlobalDtorsLegacyPass(); } // namespace llvm #endif diff --git a/llvm/include/llvm/Transforms/Utils/LowerGlobalDtors.h b/llvm/include/llvm/Transforms/Utils/LowerGlobalDtors.h deleted file mode 100644 index 993a6f57361cc..0000000000000 --- a/llvm/include/llvm/Transforms/Utils/LowerGlobalDtors.h +++ /dev/null @@ -1,28 +0,0 @@ -//===- LowerGlobalDtors.h - Lower @llvm.global_dtors ----------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This pass lowers @llvm.global_dtors by creating wrapper functions that are -// registered in @llvm.global_ctors and which contain a call to `__cxa_atexit` -// to register their destructor functions. -// -//===----------------------------------------------------------------------===// -#ifndef LLVM_TRANSFORMS_UTILS_LOWERGLOBALDTORS_H -#define LLVM_TRANSFORMS_UTILS_LOWERGLOBALDTORS_H - -#include "llvm/IR/PassManager.h" - -namespace llvm { - -class LowerGlobalDtorsPass : public PassInfoMixin<LowerGlobalDtorsPass> { -public: - PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM); -}; - -} // namespace llvm - -#endif // LLVM_TRANSFORMS_UTILS_LOWERGLOBALDTORS_H diff --git a/llvm/lib/CodeGen/CodeGen.cpp b/llvm/lib/CodeGen/CodeGen.cpp index d501838d01456..7e7fb420e3153 100644 --- a/llvm/lib/CodeGen/CodeGen.cpp +++ b/llvm/lib/CodeGen/CodeGen.cpp @@ -58,7 +58,6 @@ void llvm::initializeCodeGen(PassRegistry &Registry) { initializeLiveStacksPass(Registry); initializeLiveVariablesPass(Registry); initializeLocalStackSlotPassPass(Registry); - initializeLowerGlobalDtorsLegacyPassPass(Registry); initializeLowerIntrinsicsPass(Registry); initializeMIRAddFSDiscriminatorsPass(Registry); initializeMIRCanonicalizerPass(Registry); diff --git a/llvm/lib/CodeGen/CommandFlags.cpp b/llvm/lib/CodeGen/CommandFlags.cpp index 0743b34eab5df..87758c4983cb2 100644 --- a/llvm/lib/CodeGen/CommandFlags.cpp +++ b/llvm/lib/CodeGen/CommandFlags.cpp @@ -74,7 +74,6 @@ CGOPT(bool, StackSymbolOrdering) CGOPT(bool, StackRealign) CGOPT(std::string, TrapFuncName) CGOPT(bool, UseCtors) -CGOPT(bool, LowerGlobalDtorsViaCxaAtExit) CGOPT(bool, RelaxELFRelocations) CGOPT_EXP(bool, DataSections) CGOPT_EXP(bool, FunctionSections) @@ -342,12 +341,6 @@ codegen::RegisterCodeGenFlags::RegisterCodeGenFlags() { cl::init(false)); CGBINDOPT(UseCtors); - static cl::opt<bool> LowerGlobalDtorsViaCxaAtExit( - "lower-global-dtors-via-cxa-atexit", - cl::desc("Lower llvm.global_dtors (global destructors) via __cxa_atexit"), - cl::init(true)); - CGBINDOPT(LowerGlobalDtorsViaCxaAtExit); - static cl::opt<bool> RelaxELFRelocations( "relax-elf-relocations", cl::desc( @@ -531,7 +524,6 @@ codegen::InitTargetOptionsFromCodeGenFlags(const Triple &TheTriple) { Options.GuaranteedTailCallOpt = getEnableGuaranteedTailCallOpt(); Options.StackSymbolOrdering = getStackSymbolOrdering(); Options.UseInitArray = !getUseCtors(); - Options.LowerGlobalDtorsViaCxaAtExit = getLowerGlobalDtorsViaCxaAtExit(); Options.RelaxELFRelocations = getRelaxELFRelocations(); Options.DataSections = getExplicitDataSections().getValueOr(TheTriple.hasDefaultDataSections()); diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index 3b21e945d8def..0853c7a34354b 100644 --- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -1176,15 +1176,6 @@ void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx, dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4; } -MCSection *TargetLoweringObjectFileMachO::getStaticDtorSection( - unsigned Priority, const MCSymbol *KeySym) const { - // TODO(yln): Remove -lower-global-dtors-via-cxa-atexit fallback flag - // (LowerGlobalDtorsViaCxaAtExit) and always issue a fatal error here. - if (TM->Options.LowerGlobalDtorsViaCxaAtExit) - report_fatal_error("@llvm.global_dtors should have been lowered already"); - return StaticDtorSection; -} - void TargetLoweringObjectFileMachO::emitModuleMetadata(MCStreamer &Streamer, Module &M) const { // Emit the linker options if present. @@ -2184,7 +2175,8 @@ MCSection *TargetLoweringObjectFileWasm::getStaticCtorSection( MCSection *TargetLoweringObjectFileWasm::getStaticDtorSection( unsigned Priority, const MCSymbol *KeySym) const { - report_fatal_error("@llvm.global_dtors should have been lowered already"); + llvm_unreachable("@llvm.global_dtors should have been lowered already"); + return nullptr; } //===----------------------------------------------------------------------===// diff --git a/llvm/lib/CodeGen/TargetPassConfig.cpp b/llvm/lib/CodeGen/TargetPassConfig.cpp index 4c335392474c7..af8c311b605ea 100644 --- a/llvm/lib/CodeGen/TargetPassConfig.cpp +++ b/llvm/lib/CodeGen/TargetPassConfig.cpp @@ -895,12 +895,6 @@ void TargetPassConfig::addIRPasses() { addPass(&ShadowStackGCLoweringID); addPass(createLowerConstantIntrinsicsPass()); - // For MachO, lower @llvm.global_dtors into @llvm_global_ctors with - // __cxa_atexit() calls to avoid emitting the deprecated __mod_term_func. - if (TM->getTargetTriple().isOSBinFormatMachO() && - TM->Options.LowerGlobalDtorsViaCxaAtExit) - addPass(createLowerGlobalDtorsLegacyPass()); - // Make sure that no unreachable blocks are instruction selected. addPass(createUnreachableBlockEliminationPass()); diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 05efe90846d13..4f8cc62559345 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -230,7 +230,6 @@ #include "llvm/Transforms/Utils/LibCallsShrinkWrap.h" #include "llvm/Transforms/Utils/LoopSimplify.h" #include "llvm/Transforms/Utils/LoopVersioning.h" -#include "llvm/Transforms/Utils/LowerGlobalDtors.h" #include "llvm/Transforms/Utils/LowerInvoke.h" #include "llvm/Transforms/Utils/LowerSwitch.h" #include "llvm/Transforms/Utils/Mem2Reg.h" diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def index e0780f5ee845f..dcdf99cea5cb5 100644 --- a/llvm/lib/Passes/PassRegistry.def +++ b/llvm/lib/Passes/PassRegistry.def @@ -76,7 +76,6 @@ MODULE_PASS("invalidate<all>", InvalidateAllAnalysesPass()) MODULE_PASS("ipsccp", IPSCCPPass()) MODULE_PASS("iroutliner", IROutlinerPass()) MODULE_PASS("print-ir-similarity", IRSimilarityAnalysisPrinterPass(dbgs())) -MODULE_PASS("lower-global-dtors", LowerGlobalDtorsPass()) MODULE_PASS("lowertypetests", LowerTypeTestsPass()) MODULE_PASS("metarenamer", MetaRenamerPass()) MODULE_PASS("mergefunc", MergeFunctionsPass()) diff --git a/llvm/lib/Target/WebAssembly/CMakeLists.txt b/llvm/lib/Target/WebAssembly/CMakeLists.txt index e44ff54d04f96..c8216aacb59e8 100644 --- a/llvm/lib/Target/WebAssembly/CMakeLists.txt +++ b/llvm/lib/Target/WebAssembly/CMakeLists.txt @@ -35,6 +35,7 @@ add_llvm_target(WebAssemblyCodeGen WebAssemblyInstrInfo.cpp WebAssemblyLowerBrUnless.cpp WebAssemblyLowerEmscriptenEHSjLj.cpp + WebAssemblyLowerGlobalDtors.cpp WebAssemblyLowerRefTypesIntPtrConv.cpp WebAssemblyMachineFunctionInfo.cpp WebAssemblyMCInstLower.cpp diff --git a/llvm/lib/Target/WebAssembly/WebAssembly.h b/llvm/lib/Target/WebAssembly/WebAssembly.h index d7cd6e6f6f000..803786e0c9c25 100644 --- a/llvm/lib/Target/WebAssembly/WebAssembly.h +++ b/llvm/lib/Target/WebAssembly/WebAssembly.h @@ -26,6 +26,7 @@ class FunctionPass; // LLVM IR passes. ModulePass *createWebAssemblyLowerEmscriptenEHSjLj(); +ModulePass *createWebAssemblyLowerGlobalDtors(); ModulePass *createWebAssemblyAddMissingPrototypes(); ModulePass *createWebAssemblyFixFunctionBitcasts(); FunctionPass *createWebAssemblyOptimizeReturned(); @@ -60,6 +61,7 @@ ModulePass *createWebAssemblyMCLowerPrePass(); // PassRegistry initialization declarations. void initializeWebAssemblyAddMissingPrototypesPass(PassRegistry &); void initializeWebAssemblyLowerEmscriptenEHSjLjPass(PassRegistry &); +void initializeLowerGlobalDtorsPass(PassRegistry &); void initializeFixFunctionBitcastsPass(PassRegistry &); void initializeOptimizeReturnedPass(PassRegistry &); void initializeWebAssemblyArgumentMovePass(PassRegistry &); diff --git a/llvm/lib/Transforms/Utils/LowerGlobalDtors.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp similarity index 86% rename from llvm/lib/Transforms/Utils/LowerGlobalDtors.cpp rename to llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp index 8a945cf18d9e5..ca6f3f194645d 100644 --- a/llvm/lib/Transforms/Utils/LowerGlobalDtors.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyLowerGlobalDtors.cpp @@ -1,4 +1,4 @@ -//===-- LowerGlobalDtors.cpp - Lower @llvm.global_dtors -------------------===// +//===-- WebAssemblyLowerGlobalDtors.cpp - Lower @llvm.global_dtors --------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,31 +9,33 @@ /// \file /// Lower @llvm.global_dtors. /// +/// WebAssembly doesn't have a builtin way to invoke static destructors. /// Implement @llvm.global_dtors by creating wrapper functions that are /// registered in @llvm.global_ctors and which contain a call to /// `__cxa_atexit` to register their destructor functions. /// //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Utils/LowerGlobalDtors.h" - +#include "WebAssembly.h" +#include "llvm/ADT/MapVector.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/Intrinsics.h" -#include "llvm/InitializePasses.h" +#include "llvm/IR/Module.h" #include "llvm/Pass.h" -#include "llvm/Transforms/Utils.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/Utils/ModuleUtils.h" #include <map> using namespace llvm; -#define DEBUG_TYPE "lower-global-dtors" +#define DEBUG_TYPE "wasm-lower-global-dtors" namespace { -class LowerGlobalDtorsLegacyPass final : public ModulePass { +class LowerGlobalDtors final : public ModulePass { StringRef getPassName() const override { - return "Lower @llvm.global_dtors via `__cxa_atexit`"; + return "WebAssembly Lower @llvm.global_dtors"; } void getAnalysisUsage(AnalysisUsage &AU) const override { @@ -45,33 +47,21 @@ class LowerGlobalDtorsLegacyPass final : public ModulePass { public: static char ID; - LowerGlobalDtorsLegacyPass() : ModulePass(ID) {} + LowerGlobalDtors() : ModulePass(ID) {} }; } // End anonymous namespace -char LowerGlobalDtorsLegacyPass::ID = 0; -INITIALIZE_PASS(LowerGlobalDtorsLegacyPass, DEBUG_TYPE, - "Lower @llvm.global_dtors via `__cxa_atexit`", false, false) +char LowerGlobalDtors::ID = 0; +INITIALIZE_PASS(LowerGlobalDtors, DEBUG_TYPE, + "Lower @llvm.global_dtors for WebAssembly", false, false) -ModulePass *llvm::createLowerGlobalDtorsLegacyPass() { - return new LowerGlobalDtorsLegacyPass(); +ModulePass *llvm::createWebAssemblyLowerGlobalDtors() { + return new LowerGlobalDtors(); } -static bool runImpl(Module &M); -bool LowerGlobalDtorsLegacyPass::runOnModule(Module &M) { return runImpl(M); } - -PreservedAnalyses LowerGlobalDtorsPass::run(Module &M, - ModuleAnalysisManager &AM) { - bool Changed = runImpl(M); - if (!Changed) - return PreservedAnalyses::all(); - - PreservedAnalyses PA; - PA.preserveSet<CFGAnalyses>(); - return PA; -} +bool LowerGlobalDtors::runOnModule(Module &M) { + LLVM_DEBUG(dbgs() << "********** Lower Global Destructors **********\n"); -static bool runImpl(Module &M) { GlobalVariable *GV = M.getGlobalVariable("llvm.global_dtors"); if (!GV || !GV->hasInitializer()) return false; diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp index cd3b06b1eda6c..85014b631a078 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp @@ -25,7 +25,6 @@ #include "llvm/CodeGen/RegAllocRegistry.h" #include "llvm/CodeGen/TargetPassConfig.h" #include "llvm/IR/Function.h" -#include "llvm/InitializePasses.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/TargetRegistry.h" #include "llvm/Target/TargetOptions.h" @@ -57,7 +56,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeWebAssemblyTarget() { auto &PR = *PassRegistry::getPassRegistry(); initializeWebAssemblyAddMissingPrototypesPass(PR); initializeWebAssemblyLowerEmscriptenEHSjLjPass(PR); - initializeLowerGlobalDtorsLegacyPassPass(PR); + initializeLowerGlobalDtorsPass(PR); initializeFixFunctionBitcastsPass(PR); initializeOptimizeReturnedPass(PR); initializeWebAssemblyArgumentMovePass(PR); @@ -413,7 +412,7 @@ void WebAssemblyPassConfig::addIRPasses() { addPass(createWebAssemblyAddMissingPrototypes()); // Lower .llvm.global_dtors into .llvm_global_ctors with __cxa_atexit calls. - addPass(createLowerGlobalDtorsLegacyPass()); + addPass(createWebAssemblyLowerGlobalDtors()); // Fix function bitcasts, as WebAssembly requires caller and callee signatures // to match. diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt index 58eddb7dcbb8d..ca442d89b9804 100644 --- a/llvm/lib/Transforms/Utils/CMakeLists.txt +++ b/llvm/lib/Transforms/Utils/CMakeLists.txt @@ -44,7 +44,6 @@ add_llvm_component_library(LLVMTransformUtils LoopUnrollRuntime.cpp LoopUtils.cpp LoopVersioning.cpp - LowerGlobalDtors.cpp LowerInvoke.cpp LowerMemIntrinsics.cpp LowerSwitch.cpp diff --git a/llvm/test/CodeGen/ARM/ctors_dtors.ll b/llvm/test/CodeGen/ARM/ctors_dtors.ll index 5778d3634e27d..1320ee2285140 100644 --- a/llvm/test/CodeGen/ARM/ctors_dtors.ll +++ b/llvm/test/CodeGen/ARM/ctors_dtors.ll @@ -1,15 +1,9 @@ ; RUN: llc < %s -mtriple=arm-apple-darwin | FileCheck %s -check-prefix=DARWIN -; RUN: llc < %s -mtriple=arm-apple-darwin -lower-global-dtors-via-cxa-atexit=false | FileCheck %s -check-prefix=DARWIN-OLD ; RUN: llc < %s -mtriple=arm-linux-gnu -target-abi=apcs | FileCheck %s -check-prefix=ELF ; RUN: llc < %s -mtriple=arm-linux-gnueabi | FileCheck %s -check-prefix=GNUEABI -; DARWIN: l_register_call_dtors: -; DARWIN: bl ___cxa_atexit ; DARWIN: .section __DATA,__mod_init_func,mod_init_funcs -; DARWIN-NOT: __mod_term_func - -; DARWIN-OLD: .section __DATA,__mod_init_func,mod_init_funcs -; DARWIN-OLD: .section __DATA,__mod_term_func,mod_term_funcs +; DARWIN: .section __DATA,__mod_term_func,mod_term_funcs ; ELF: .section .ctors,"aw",%progbits ; ELF: .section .dtors,"aw",%progbits diff --git a/llvm/test/CodeGen/X86/2011-08-29-InitOrder.ll b/llvm/test/CodeGen/X86/2011-08-29-InitOrder.ll index 6754ae9fb14a1..8c0075da03065 100644 --- a/llvm/test/CodeGen/X86/2011-08-29-InitOrder.ll +++ b/llvm/test/CodeGen/X86/2011-08-29-InitOrder.ll @@ -10,13 +10,9 @@ ; CHECK-DEFAULT: .section .ctors.64535,"aw",@progbits ; CHECK-DEFAULT: .long construct_1 -; CHECK-DARWIN-LABEL: .section __DATA,__mod_init_func,mod_init_funcs -; CHECK-DARWIN: .long _construct_1 -; CHECK-DARWIN-NEXT: .long l_register_call_dtors.1000 +; CHECK-DARWIN: .long _construct_1 ; CHECK-DARWIN-NEXT: .long _construct_2 -; CHECK-DARWIN-NEXT: .long l_register_call_dtors.2000 ; CHECK-DARWIN-NEXT: .long _construct_3 -; CHECK-DARWIN-NEXT: .long l_register_call_dtors.3000 @llvm.global_dtors = appending global [3 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 2000, void ()* @destruct_2, i8* null }, { i32, void ()*, i8* } { i32 1000, void ()* @destruct_1, i8* null }, { i32, void ()*, i8* } { i32 3000, void ()* @destruct_3, i8* null }] ; CHECK-DEFAULT: .section .dtors.62535,"aw",@progbits @@ -26,7 +22,9 @@ ; CHECK-DEFAULT: .section .dtors.64535,"aw",@progbits ; CHECK-DEFAULT: .long destruct_1 -; CHECK-DARWIN-NOT: mod_term_func +; CHECK-DARWIN: .long _destruct_1 +; CHECK-DARWIN-NEXT: .long _destruct_2 +; CHECK-DARWIN-NEXT: .long _destruct_3 declare void @construct_1() declare void @construct_2() diff --git a/llvm/test/Transforms/LowerGlobalDestructors/lower-global-dtors.ll b/llvm/test/Transforms/LowerGlobalDestructors/lower-global-dtors.ll deleted file mode 100644 index b950fa1a91c11..0000000000000 --- a/llvm/test/Transforms/LowerGlobalDestructors/lower-global-dtors.ll +++ /dev/null @@ -1,156 +0,0 @@ -; RUN: opt -lower-global-dtors -S < %s | FileCheck %s --implicit-check-not=llvm.global_dtors -; RUN: opt -passes=lower-global-dtors -S < %s | FileCheck %s --implicit-check-not=llvm.global_dtors - -; Test that @llvm.global_dtors is properly lowered into @llvm.global_ctors, -; grouping dtor calls by priority and associated symbol. - -declare void @orig_ctor() -declare void @orig_dtor0() -declare void @orig_dtor1a() -declare void @orig_dtor1b() -declare void @orig_dtor1c0() -declare void @orig_dtor1c1a() -declare void @orig_dtor1c1b() -declare void @orig_dtor1c2a() -declare void @orig_dtor1c2b() -declare void @orig_dtor1c3() -declare void @orig_dtor1d() -declare void @orig_dtor65535() -declare void @orig_dtor65535c0() -declare void @after_the_null() - -@associatedc0 = external global i8 -@associatedc1 = external global i8 -@associatedc2 = global i8 42 -@associatedc3 = global i8 84 - -@llvm.global_ctors = appending global -[1 x { i32, void ()*, i8* }] -[ - { i32, void ()*, i8* } { i32 200, void ()* @orig_ctor, i8* null } -] - -@llvm.global_dtors = appending global -[14 x { i32, void ()*, i8* }] -[ - { i32, void ()*, i8* } { i32 0, void ()* @orig_dtor0, i8* null }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1a, i8* null }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1b, i8* null }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1c0, i8* @associatedc0 }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1c1a, i8* @associatedc1 }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1c1b, i8* @associatedc1 }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1c2a, i8* @associatedc2 }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1c2b, i8* @associatedc2 }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1c3, i8* @associatedc3 }, - { i32, void ()*, i8* } { i32 1, void ()* @orig_dtor1d, i8* null }, - { i32, void ()*, i8* } { i32 65535, void ()* @orig_dtor65535c0, i8* @associatedc0 }, - { i32, void ()*, i8* } { i32 65535, void ()* @orig_dtor65535, i8* null }, - { i32, void ()*, i8* } { i32 65535, void ()* null, i8* null }, - { i32, void ()*, i8* } { i32 65535, void ()* @after_the_null, i8* null } -] - -; CHECK: @associatedc0 = external global i8 -; CHECK: @associatedc1 = external global i8 -; CHECK: @associatedc2 = global i8 42 -; CHECK: @associatedc3 = global i8 84 -; CHECK: @__dso_handle = extern_weak hidden constant i8 - -; CHECK-LABEL: @llvm.global_ctors = appending global [10 x { i32, void ()*, i8* }] [ -; CHECK-SAME: { i32, void ()*, i8* } { i32 200, void ()* @orig_ctor, i8* null }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 0, void ()* @register_call_dtors.0, i8* null }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 1, void ()* @"register_call_dtors.1$0", i8* null }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 1, void ()* @"register_call_dtors.1$1.associatedc0", i8* @associatedc0 }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 1, void ()* @"register_call_dtors.1$2.associatedc1", i8* @associatedc1 }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 1, void ()* @"register_call_dtors.1$3.associatedc2", i8* @associatedc2 }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 1, void ()* @"register_call_dtors.1$4.associatedc3", i8* @associatedc3 }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 1, void ()* @"register_call_dtors.1$5", i8* null }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 65535, void ()* @"register_call_dtors$0.associatedc0", i8* @associatedc0 }, -; CHECK-SAME: { i32, void ()*, i8* } { i32 65535, void ()* @"register_call_dtors$1", i8* null }] - -; CHECK: declare void @orig_ctor() -; CHECK: declare void @orig_dtor0() -; --- other dtors here --- -; CHECK: declare void @after_the_null() - -; CHECK: declare i32 @__cxa_atexit(void (i8*)*, i8*, i8*) - -; CHECK-LABEL: define private void @call_dtors.0(i8* %0) -; CHECK: call void @orig_dtor0() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @register_call_dtors.0() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @call_dtors.0, i8* null, i8* @__dso_handle) -; CHECK-NEXT: %0 = icmp ne i32 %call, 0 -; CHECK-NEXT: br i1 %0, label %fail, label %return -; CHECK-EMPTY: -; CHECK-NEXT: fail: -; CHECK-NEXT: call void @llvm.trap() -; CHECK-NEXT: unreachable -; CHECK-EMPTY: -; CHECK-NEXT: return: -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"call_dtors.1$0"(i8* %0) -; CHECK: call void @orig_dtor1b() -; CHECK-NEXT: call void @orig_dtor1a() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors.1$0"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors.1$0", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors.1$1.associatedc0"(i8* %0) -; CHECK: call void @orig_dtor1c0() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors.1$1.associatedc0"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors.1$1.associatedc0", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors.1$2.associatedc1"(i8* %0) -; CHECK: call void @orig_dtor1c1b() -; CHECK-NEXT: call void @orig_dtor1c1a() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors.1$2.associatedc1"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors.1$2.associatedc1", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors.1$3.associatedc2"(i8* %0) -; CHECK: call void @orig_dtor1c2b() -; CHECK-NEXT: call void @orig_dtor1c2a() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors.1$3.associatedc2"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors.1$3.associatedc2", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors.1$4.associatedc3"(i8* %0) -; CHECK: call void @orig_dtor1c3() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors.1$4.associatedc3"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors.1$4.associatedc3", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors.1$5"(i8* %0) -; CHECK: call void @orig_dtor1d() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors.1$5"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors.1$5", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors$0.associatedc0"(i8* %0) -; CHECK: call void @orig_dtor65535c0() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors$0.associatedc0"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors$0.associatedc0", i8* null, i8* @__dso_handle) - -; CHECK-LABEL: define private void @"call_dtors$1"(i8* %0) -; CHECK: call void @orig_dtor65535() -; CHECK-NEXT: ret void - -; CHECK-LABEL: define private void @"register_call_dtors$1"() -; CHECK: %call = call i32 @__cxa_atexit(void (i8*)* @"call_dtors$1", i8* null, i8* @__dso_handle) - - -; This function is listed after the null terminator, so it should -; be excluded. - -; CHECK-NOT: after_the_null _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
