Index: clang/include/clang/AST/Mangle.h =================================================================== --- clang/include/clang/AST/Mangle.h +++ clang/include/clang/AST/Mangle.h @@ -175,6 +175,8 @@ virtual void mangleLambdaSig(const CXXRecordDecl *Lambda, raw_ostream &) = 0; + virtual void mangleDynamicStermFinalizer(const VarDecl *D, raw_ostream &) = 0; + bool isUniqueNameMangler() { return IsUniqueNameMangler; } static bool classof(const MangleContext *C) { Index: clang/lib/AST/ItaniumMangle.cpp =================================================================== --- clang/lib/AST/ItaniumMangle.cpp +++ clang/lib/AST/ItaniumMangle.cpp @@ -160,6 +160,7 @@ void mangleDynamicInitializer(const VarDecl *D, raw_ostream &Out) override; void mangleDynamicAtExitDestructor(const VarDecl *D, raw_ostream &Out) override; + void mangleDynamicStermFinalizer(const VarDecl *D, raw_ostream &Out) override; void mangleSEHFilterExpression(const NamedDecl *EnclosingDecl, raw_ostream &Out) override; void mangleSEHFinallyBlock(const NamedDecl *EnclosingDecl, @@ -5222,6 +5223,18 @@ Mangler.getStream() << D->getName(); } +void ItaniumMangleContextImpl::mangleDynamicStermFinalizer(const VarDecl *D, + raw_ostream &Out) { + // Clang generates these internal-linkage functions as part of its + // implementation of the XL ABI. + CXXNameMangler Mangler(*this, Out); + Mangler.getStream() << "__cxx_global_var_destruct_"; + if (shouldMangleDeclName(D)) + Mangler.mangle(D); + else + Mangler.getStream() << D->getName(); +} + void ItaniumMangleContextImpl::mangleSEHFilterExpression( const NamedDecl *EnclosingDecl, raw_ostream &Out) { CXXNameMangler Mangler(*this, Out); Index: clang/lib/CodeGen/CGCXXABI.h =================================================================== --- clang/lib/CodeGen/CGCXXABI.h +++ clang/lib/CodeGen/CGCXXABI.h @@ -108,6 +108,8 @@ virtual bool hasMostDerivedReturn(GlobalDecl GD) const { return false; } + virtual bool useSinitAndSterm() const { return false; } + /// Returns true if the target allows calling a function through a pointer /// with a different signature than the actual function (or equivalently, /// bitcasting a function or function pointer to a different function type). Index: clang/lib/CodeGen/CGDeclCXX.cpp =================================================================== --- clang/lib/CodeGen/CGDeclCXX.cpp +++ clang/lib/CodeGen/CGDeclCXX.cpp @@ -20,7 +20,9 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/IR/Intrinsics.h" #include "llvm/IR/MDBuilder.h" +#include "llvm/Support/Format.h" #include "llvm/Support/Path.h" +#include "llvm/Transforms/Utils/ModuleUtils.h" using namespace clang; using namespace CodeGen; @@ -249,7 +251,7 @@ llvm::CallInst *call = CGF.Builder.CreateCall(dtor, addr); - // Make sure the call and the callee agree on calling convention. + // Make sure the call and the callee agree on calling convention. if (auto *dtorFn = dyn_cast( dtor.getCallee()->stripPointerCastsAndAliases())) call->setCallingConv(dtorFn->getCallingConv()); @@ -270,8 +272,12 @@ void CodeGenFunction::registerGlobalDtorWithAtExit(llvm::Constant *dtorStub) { // extern "C" int atexit(void (*f)(void)); + assert(cast(dtorStub)->getFunctionType() == + llvm::FunctionType::get(CGM.VoidTy, false) && + "atexit has wrong parameter type."); + llvm::FunctionType *atexitTy = - llvm::FunctionType::get(IntTy, dtorStub->getType(), false); + llvm::FunctionType::get(IntTy, dtorStub->getType(), false); llvm::FunctionCallee atexit = CGM.CreateRuntimeFunction(atexitTy, "atexit", llvm::AttributeList(), @@ -282,6 +288,26 @@ EmitNounwindRuntimeCall(atexit, dtorStub); } +llvm::Value * +CodeGenFunction::unregisterGlobalDtorWithUnAtExit(llvm::Function *dtorStub) { + // extern "C" int unatexit(void (*f)(void)); + assert(dtorStub->getFunctionType() == + llvm::FunctionType::get(CGM.VoidTy, false) && + "unatexit has wrong parameter type."); + + llvm::FunctionType *unatexitTy = + llvm::FunctionType::get(IntTy, {dtorStub->getType()}, /*isVarArg=*/false); + + llvm::FunctionCallee unatexit = + CGM.CreateRuntimeFunction(unatexitTy, "unatexit", llvm::AttributeList()); + + if (llvm::Function *unatexitFn = + dyn_cast(unatexit.getCallee())) + unatexitFn->setDoesNotThrow(); + + return EmitNounwindRuntimeCall(unatexit, dtorStub); +} + void CodeGenFunction::EmitCXXGuardedInit(const VarDecl &D, llvm::GlobalVariable *DeclPtr, bool PerformInit) { @@ -533,6 +559,22 @@ CXXThreadLocals.clear(); } +static StringRef getTransformedFileName(llvm::Module &M, SmallString<128> FileName) { + FileName = llvm::sys::path::filename(M.getName()); + + if (FileName.empty()) + FileName = ""; + + for (size_t i = 0; i < FileName.size(); ++i) { + // Replace everything that's not [a-zA-Z0-9._] with a _. This set happens + // to be the set of C preprocessing numbers. + if (!isPreprocessingNumberBody(FileName[i])) + FileName[i] = '_'; + } + + return FileName; +} + void CodeGenModule::EmitCXXGlobalInitFunc() { while (!CXXGlobalInits.empty() && !CXXGlobalInits.back()) @@ -541,11 +583,27 @@ if (CXXGlobalInits.empty() && PrioritizedCXXGlobalInits.empty()) return; + const bool UseSinitAndSterm = getCXXABI().useSinitAndSterm(); + if (UseSinitAndSterm) { + GlobalUniqueModuleId = getUniqueModuleId(&getModule()); + + // FIXME: We need to figure out what to hash on or encode into the unique ID + // we need. + if (GlobalUniqueModuleId.compare("") == 0) + llvm::report_fatal_error( + "cannot produce a unique identifier for this module" + " based on strong external symbols"); + GlobalUniqueModuleId = GlobalUniqueModuleId.substr(1); + } + llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, false); const CGFunctionInfo &FI = getTypes().arrangeNullaryFunction(); - // Create our global initialization function. + // Create our global prioritized initialization function. if (!PrioritizedCXXGlobalInits.empty()) { + assert(!UseSinitAndSterm && "Prioritized Sinit and Sterm functions are not" + " supported yet."); + SmallVector LocalCXXGlobalInits; llvm::array_pod_sort(PrioritizedCXXGlobalInits.begin(), PrioritizedCXXGlobalInits.end()); @@ -577,22 +635,29 @@ PrioritizedCXXGlobalInits.clear(); } - // Include the filename in the symbol name. Including "sub_" matches gcc and - // makes sure these symbols appear lexicographically behind the symbols with - // priority emitted above. - SmallString<128> FileName = llvm::sys::path::filename(getModule().getName()); - if (FileName.empty()) - FileName = ""; + // Create our global initialization function. + if (CXXGlobalInits.empty()) + return; - for (size_t i = 0; i < FileName.size(); ++i) { - // Replace everything that's not [a-zA-Z0-9._] with a _. This set happens - // to be the set of C preprocessing numbers. - if (!isPreprocessingNumberBody(FileName[i])) - FileName[i] = '_'; + // When not using sinit and sterm functions, include the filename in the + // symbol name. Including "sub_" matches gcc and makes sure these symbols + // appear lexicographically behind the symbols with priority emitted above. + StringRef FuncName; + SmallString<128> Storage; + if (UseSinitAndSterm) + FuncName = llvm::Twine("__sinit80000000_clang_", GlobalUniqueModuleId) + .toNullTerminatedStringRef(Storage); + else { + FuncName = llvm::Twine("_GLOBAL__sub_I_", + getTransformedFileName(getModule(), Storage)) + .toNullTerminatedStringRef(Storage); } - llvm::Function *Fn = CreateGlobalInitOrDestructFunction( - FTy, llvm::Twine("_GLOBAL__sub_I_", FileName), FI); + llvm::Function *Fn = + CreateGlobalInitOrDestructFunction(FTy, FuncName, FI, SourceLocation()); + + if (getCXXABI().useSinitAndSterm()) + Fn->setLinkage(llvm::Function::ExternalLinkage); CodeGenFunction(*this).GenerateCXXGlobalInitFunc(Fn, CXXGlobalInits); AddGlobalCtor(Fn); @@ -623,14 +688,27 @@ return; llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, false); + const CGFunctionInfo &FI = getTypes().arrangeNullaryFunction(); + bool UseSinitAndSterm = getCXXABI().useSinitAndSterm(); // Create our global destructor function. - const CGFunctionInfo &FI = getTypes().arrangeNullaryFunction(); - llvm::Function *Fn = - CreateGlobalInitOrDestructFunction(FTy, "_GLOBAL__D_a", FI); + llvm::Function *Fn = nullptr; + if (UseSinitAndSterm) { + assert(!GlobalUniqueModuleId.empty() && + "Invalid empty GlobalUniqueModuleId."); + + Fn = CreateGlobalInitOrDestructFunction( + FTy, llvm::Twine("__sterm80000000_clang_") + GlobalUniqueModuleId, FI, + SourceLocation()); + + Fn->setLinkage(llvm::Function::ExternalLinkage); + } else { + Fn = CreateGlobalInitOrDestructFunction(FTy, "_GLOBAL__D_a", FI); + } CodeGenFunction(*this).GenerateCXXGlobalDtorsFunc(Fn, CXXGlobalDtors); AddGlobalDtor(Fn); + CXXGlobalDtors.clear(); } /// Emit the code necessary to initialize the given global variable. @@ -743,7 +821,9 @@ llvm::Value *Callee; llvm::Constant *Arg; std::tie(CalleeTy, Callee, Arg) = DtorsAndObjects[e - i - 1]; - llvm::CallInst *CI = Builder.CreateCall(CalleeTy, Callee, Arg); + llvm::CallInst *CI = (Arg == nullptr) + ? Builder.CreateCall(CalleeTy, Callee) + : Builder.CreateCall(CalleeTy, Callee, Arg); // Make sure the call and the callee agree on calling convention. if (llvm::Function *F = dyn_cast(Callee)) CI->setCallingConv(F->getCallingConv()); Index: clang/lib/CodeGen/CodeGenFunction.h =================================================================== --- clang/lib/CodeGen/CodeGenFunction.h +++ clang/lib/CodeGen/CodeGenFunction.h @@ -4171,6 +4171,9 @@ /// Call atexit() with function dtorStub. void registerGlobalDtorWithAtExit(llvm::Constant *dtorStub); + /// Call unatexit() with function dtorStub. + llvm::Value *unregisterGlobalDtorWithUnAtExit(llvm::Function *dtorStub); + /// Emit code in this function to perform a guarded variable /// initialization. Guarded initializations are used when it's not /// possible to prove that an initialization will be done exactly Index: clang/lib/CodeGen/CodeGenModule.h =================================================================== --- clang/lib/CodeGen/CodeGenModule.h +++ clang/lib/CodeGen/CodeGenModule.h @@ -397,6 +397,10 @@ /// emitted when the translation unit is complete. CtorList GlobalDtors; + /// A unique trailing identifier as a part of sinit/sterm function when + /// UseSinitAndSterm of CXXABI set as true. + std::string GlobalUniqueModuleId; + /// An ordered map of canonical GlobalDecls to their mangled names. llvm::MapVector MangledDeclNames; llvm::StringMap Manglings; @@ -1049,6 +1053,12 @@ Object); } + /// Add a destructor to the C++ global destructor function. + void AddCXXDtorEntry(llvm::FunctionCallee DtorFn) { + CXXGlobalDtors.emplace_back(DtorFn.getFunctionType(), DtorFn.getCallee(), + nullptr); + } + /// Create or return a runtime function declaration with the specified type /// and name. If \p AssumeConvergent is true, the call will have the /// convergent attribute added. Index: clang/lib/CodeGen/ItaniumCXXABI.cpp =================================================================== --- clang/lib/CodeGen/ItaniumCXXABI.cpp +++ clang/lib/CodeGen/ItaniumCXXABI.cpp @@ -526,6 +526,13 @@ void registerGlobalDtor(CodeGenFunction &CGF, const VarDecl &D, llvm::FunctionCallee dtor, llvm::Constant *addr) override; + + bool useSinitAndSterm() const override { return true; } + +private: + void emitCXXGlobalVarDeclDestructFunc(const VarDecl &D, + llvm::Function *dtorStub, + llvm::Constant *addr); }; } @@ -4432,6 +4439,66 @@ void XLCXXABI::registerGlobalDtor(CodeGenFunction &CGF, const VarDecl &D, llvm::FunctionCallee dtor, llvm::Constant *addr) { - llvm::report_fatal_error("Static initialization has not been implemented on" - " XL ABI yet."); + if (D.getTLSKind() != VarDecl::TLS_None) + llvm::report_fatal_error("thread local storage unimplemented on AIX yet"); + + // Create __dtor function for the var decl. + llvm::Function *dtorStub = CGF.createAtExitStub(D, dtor, addr); + + if (CGM.getCodeGenOpts().CXAAtExit) + llvm::report_fatal_error("using __cxa_atexit unsupported on AIX."); + // Register above __dtor with atexit(). + CGF.registerGlobalDtorWithAtExit(dtorStub); + + // Emit __cxx_global_var_destruct function to unregister __dtor and call + // __dtor. + emitCXXGlobalVarDeclDestructFunc(D, dtorStub, addr); +} + +void XLCXXABI::emitCXXGlobalVarDeclDestructFunc(const VarDecl &D, + llvm::Function *dtorStub, + llvm::Constant *addr) { + llvm::FunctionType *FTy = llvm::FunctionType::get(CGM.VoidTy, false); + SmallString<256> FnName; + { + llvm::raw_svector_ostream Out(FnName); + getMangleContext().mangleDynamicStermFinalizer(&D, Out); + } + + // Create a variable destruction function. + const CGFunctionInfo &FI = CGM.getTypes().arrangeNullaryFunction(); + llvm::Function *GlobalVDTermFn = CGM.CreateGlobalInitOrDestructFunction( + FTy, FnName.str(), FI, D.getLocation()); + + CodeGenFunction CGF(CGM); + + CGF.StartFunction(GlobalDecl(), CGM.getContext().VoidTy, GlobalVDTermFn, FI, + FunctionArgList()); + + // Unregister the dtorStub. + llvm::Value *V = CGF.unregisterGlobalDtorWithUnAtExit(dtorStub); + + llvm::Value *NeedsDestruct = + CGF.Builder.CreateIsNull(V, "guard.needsDestruct"); + + llvm::BasicBlock *DestructCallBlock = CGF.createBasicBlock("destruct.call"); + llvm::BasicBlock *EndBlock = CGF.createBasicBlock("destruct.end"); + + // Check if the guard variable is zero. + CGF.EmitCXXGuardedInitBranch(NeedsDestruct, DestructCallBlock, EndBlock, + CodeGenFunction::GuardKind::VariableGuard, &D); + + CGF.EmitBlock(DestructCallBlock); + + // Emit the call to dtorStub. + llvm::CallInst *CI = CGF.Builder.CreateCall(dtorStub); + + // Make sure the call and the callee agree on calling convention. + CI->setCallingConv(dtorStub->getCallingConv()); + + CGF.EmitBlock(EndBlock); + + CGF.FinishFunction(); + + CGM.AddCXXDtorEntry(GlobalVDTermFn); } Index: clang/lib/Sema/SemaDeclAttr.cpp =================================================================== --- clang/lib/Sema/SemaDeclAttr.cpp +++ clang/lib/Sema/SemaDeclAttr.cpp @@ -6939,13 +6939,20 @@ handlePassObjectSizeAttr(S, D, AL); break; case ParsedAttr::AT_Constructor: - handleConstructorAttr(S, D, AL); + if (S.Context.getTargetInfo().getTriple().isOSAIX()) + llvm::report_fatal_error( + "'constructor' attribute unsupported on AIX yet"); + else + handleConstructorAttr(S, D, AL); break; case ParsedAttr::AT_Deprecated: handleDeprecatedAttr(S, D, AL); break; case ParsedAttr::AT_Destructor: - handleDestructorAttr(S, D, AL); + if (S.Context.getTargetInfo().getTriple().isOSAIX()) + llvm::report_fatal_error("'destructor' attribute unsupported on AIX yet"); + else + handleDestructorAttr(S, D, AL); break; case ParsedAttr::AT_EnableIf: handleEnableIfAttr(S, D, AL); @@ -7139,7 +7146,11 @@ handleVecTypeHint(S, D, AL); break; case ParsedAttr::AT_InitPriority: - handleInitPriorityAttr(S, D, AL); + if (S.Context.getTargetInfo().getTriple().isOSAIX()) + llvm::report_fatal_error( + "'init_priority' attribute unsupported on AIX yet"); + else + handleInitPriorityAttr(S, D, AL); break; case ParsedAttr::AT_Packed: handlePackedAttr(S, D, AL); Index: clang/test/CodeGen/aix-constructor-attribute.cpp =================================================================== --- /dev/null +++ clang/test/CodeGen/aix-constructor-attribute.cpp @@ -0,0 +1,18 @@ +// RUN: not %clang_cc1 -triple powerpc-ibm-aix-xcoff -x c++ -emit-llvm < %s \ +// RUN: 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -triple powerpc64-ibm-aix-xcoff -x c++ -emit-llvm < %s \ +// RUN: 2>&1 | FileCheck %s + +int foo() __attribute__((constructor(180))); + +class test { + int a; + +public: + test(int c) { a = c; } + ~test() { a = 0; } +}; + +test t(1); + +// CHECK: fatal error: error in backend: 'constructor' attribute unsupported on AIX yet Index: clang/test/CodeGen/aix-destructor-attribute.cpp =================================================================== --- /dev/null +++ clang/test/CodeGen/aix-destructor-attribute.cpp @@ -0,0 +1,18 @@ +// RUN: not %clang_cc1 -triple powerpc-ibm-aix-xcoff -x c++ -emit-llvm < %s \ +// RUN: 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -triple powerpc64-ibm-aix-xcoff -x c++ -emit-llvm < %s \ +// RUN: 2>&1 | FileCheck %s + +int bar() __attribute__((destructor(180))); + +class test { + int a; + +public: + test(int c) { a = c; } + ~test() { a = 0; } +}; + +test t(1); + +// CHECK: fatal error: error in backend: 'destructor' attribute unsupported on AIX yet Index: clang/test/CodeGen/aix-init-priority-attribute.cpp =================================================================== --- /dev/null +++ clang/test/CodeGen/aix-init-priority-attribute.cpp @@ -0,0 +1,17 @@ +// RUN: not %clang_cc1 -triple powerpc-ibm-aix-xcoff -x c++ -emit-llvm < %s \ +// RUN: 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -triple powerpc64-ibm-aix-xcoff -x c++ -emit-llvm < %s \ +// RUN: 2>&1 | FileCheck %s + +class test { + int a; + +public: + test(int c) { a = c; } + ~test() { a = 0; } +}; + +__attribute__((init_priority(2000))) +test t(1); + +// CHECK: fatal error: error in backend: 'init_priority' attribute unsupported on AIX yet Index: clang/test/CodeGen/static-init.cpp =================================================================== --- clang/test/CodeGen/static-init.cpp +++ clang/test/CodeGen/static-init.cpp @@ -1,12 +1,87 @@ -// RUN: not %clang_cc1 -triple powerpc-ibm-aix-xcoff -S -emit-llvm -x c++ %s \ -// RUN: -o /dev/null 2>&1 | FileCheck %s +// RUN: %clang_cc1 -triple powerpc-ibm-aix-xcoff -S -emit-llvm -x c++ \ +// RUN: -fno-use-cxa-atexit < %s | \ +// RUN: FileCheck %s -// RUN: not %clang_cc1 -triple powerpc64-ibm-aix-xcoff -S -emit-llvm -x c++ %s \ -// RUN: -o /dev/null 2>&1 | FileCheck %s +// RUN: %clang_cc1 -triple powerpc64-ibm-aix-xcoff -S -emit-llvm -x c++ \ +// RUN: -fno-use-cxa-atexit < %s | \ +// RUN: FileCheck %s struct test { test(); ~test(); -} t; +} t1, t2; -// CHECK: error in backend: Static initialization has not been implemented on XL ABI yet. +// CHECK: @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @__sinit80000000_clang_66d40ba2f9a26b497582a82a8a262181, i8* null }] +// CHECK: @llvm.global_dtors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @__sterm80000000_clang_66d40ba2f9a26b497582a82a8a262181, i8* null }] + +// CHECK: define internal void @__cxx_global_var_init() #0 { +// CHECK: entry: +// CHECK: call void @_ZN4testC1Ev(%struct.test* @t1) +// CHECK: %0 = call i32 @atexit(void ()* @__dtor_t1) +// CHECK: ret void +// CHECK: } + +// CHECK: define internal void @__dtor_t1() #0 { +// CHECK: entry: +// CHECK: call void @_ZN4testD1Ev(%struct.test* @t1) +// CHECK: ret void +// CHECK: } + +// CHECK: declare i32 @atexit(void ()*) + +// CHECK: define internal void @__cxx_global_var_destruct_t1() #0 { +// CHECK: entry: +// CHECK: %0 = call i32 @unatexit(void ()* @__dtor_t1) +// CHECK: %guard.needsDestruct = icmp eq i32 %0, 0 +// CHECK: br i1 %guard.needsDestruct, label %destruct.call, label %destruct.end + +// CHECK: destruct.call: +// CHECK: call void @__dtor_t1() +// CHECK: br label %destruct.end + +// CHECK: destruct.end: +// CHECK: ret void +// CHECK: } + +// CHECK: declare i32 @unatexit(void ()*) #3 + +// CHECK: define internal void @__cxx_global_var_init.1() #0 { +// CHECK: entry: +// CHECK: call void @_ZN4testC1Ev(%struct.test* @t2) +// CHECK: %0 = call i32 @atexit(void ()* @__dtor_t2) +// CHECK: ret void +// CHECK: } + +// CHECK: define internal void @__dtor_t2() #0 { +// CHECK: entry: +// CHECK: call void @_ZN4testD1Ev(%struct.test* @t2) +// CHECK: ret void +// CHECK: } + +// CHECK: define internal void @__cxx_global_var_destruct_t2() #0 { +// CHECK: entry: +// CHECK: %0 = call i32 @unatexit(void ()* @__dtor_t2) +// CHECK: %guard.needsDestruct = icmp eq i32 %0, 0 +// CHECK: br i1 %guard.needsDestruct, label %destruct.call, label %destruct.end + +// CHECK: destruct.call: +// CHECK: call void @__dtor_t2() +// CHECK: br label %destruct.end + +// CHECK: destruct.end: +// CHECK: ret void +// CHECK: } + +// CHECK: define dso_local void @__sinit80000000_clang_66d40ba2f9a26b497582a82a8a262181() #0 { +// CHECK: entry: +// CHECK: call void @__cxx_global_var_init() +// CHECK: call void @__cxx_global_var_init.1() +// CHECK: ret void +// CHECK: } + +// CHECK: define dso_local void @__sterm80000000_clang_66d40ba2f9a26b497582a82a8a262181() #0 { +// CHECK: entry: +// CHECK: call void @__cxx_global_var_destruct_t2() +// CHECK: call void @__cxx_global_var_destruct_t1() +// CHECK: ret void +// CHECK: }