From: Anders Carlsson Date: Wed, 15 Apr 2009 15:55:24 +0000 (+0000) Subject: Start attempting to generate code for C++ ctors. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95d4e5d2f87a0f07fb143ccb824dfc4c5c595c78;p=clang Start attempting to generate code for C++ ctors. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69168 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 4df760d593..7ef147f5f2 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -114,7 +114,6 @@ RValue CodeGenFunction::EmitCXXMemberCallExpr(const CXXMemberCallExpr *CE) { Callee, Args, MD); } - llvm::Value *CodeGenFunction::LoadCXXThis() { assert(isa(CurFuncDecl) && "Must be in a C++ member function decl to load 'this'"); @@ -124,3 +123,35 @@ llvm::Value *CodeGenFunction::LoadCXXThis() { // FIXME: What if we're inside a block? return Builder.CreateLoad(LocalDeclMap[CXXThisDecl], "this"); } + +const char *CodeGenModule::getMangledCXXCtorName(const CXXConstructorDecl *D, + CXXCtorType Type) { + llvm::SmallString<256> Name; + llvm::raw_svector_ostream Out(Name); + mangleCXXCtor(D, Type, Context, Out); + + Name += '\0'; + return UniqueMangledName(Name.begin(), Name.end()); +} + +void CodeGenModule::EmitCXXConstructor(const CXXConstructorDecl *D, + CXXCtorType Type) { + const llvm::FunctionType *Ty = + getTypes().GetFunctionType(getTypes().getFunctionInfo(D), false); + + const char *Name = getMangledCXXCtorName(D, Type); + llvm::Function *Fn = + cast(GetOrCreateLLVMFunction(Name, Ty, D)); + + CodeGenFunction(*this).GenerateCode(D, Fn); + + SetFunctionDefinitionAttributes(D, Fn); + SetLLVMFunctionAttributesForDefinition(D, Fn); +} + +void CodeGenModule::EmitCXXConstructors(const CXXConstructorDecl *D) { + ErrorUnsupported(D, "C++ constructor", true); + + EmitCXXConstructor(D, Ctor_Complete); + EmitCXXConstructor(D, Ctor_Base); +} diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 733cc0bbf3..a62145ce29 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -156,7 +156,14 @@ const char *CodeGenModule::getMangledName(const NamedDecl *ND) { } Name += '\0'; - return MangledNames.GetOrCreateValue(Name.begin(), Name.end()).getKeyData(); + return UniqueMangledName(Name.begin(), Name.end()); +} + +const char *CodeGenModule::UniqueMangledName(const char *NameStart, + const char *NameEnd) { + assert(*(NameEnd - 1) == '\0' && "Mangled name must be null terminated!"); + + return MangledNames.GetOrCreateValue(NameStart, NameEnd).getKeyData(); } /// AddGlobalCtor - Add a function to the list that will be called before @@ -1344,11 +1351,15 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) { EmitGlobal(cast(D)); break; + // C++ Decls case Decl::Namespace: EmitNamespace(cast(D)); break; - - // Objective-C Decls + case Decl::CXXConstructor: + EmitCXXConstructors(cast(D)); + break; + + // Objective-C Decls // Forward declarations, no (immediate) code generation. case Decl::ObjCClass: diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index 9a61a68f42..a1fc715344 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -18,6 +18,7 @@ #include "clang/AST/Attr.h" #include "CGBlocks.h" #include "CGCall.h" +#include "CGCXX.h" #include "CodeGenTypes.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/StringMap.h" @@ -311,7 +312,9 @@ public: AttributeListType &PAL); const char *getMangledName(const NamedDecl *ND); - + const char *getMangledCXXCtorName(const CXXConstructorDecl *D, + CXXCtorType Type); + enum GVALinkage { GVA_Internal, GVA_C99Inline, @@ -320,6 +323,10 @@ public: }; private: + /// UniqueMangledName - Unique a name by (if necessary) inserting it into the + /// MangledNames string map. + const char *UniqueMangledName(const char *NameStart, const char *NameEnd); + llvm::Constant *GetOrCreateLLVMFunction(const char *MangledName, const llvm::Type *Ty, const FunctionDecl *D); @@ -353,8 +360,19 @@ private: void EmitGlobalVarDefinition(const VarDecl *D); void EmitAliasDefinition(const ValueDecl *D); void EmitObjCPropertyImplementations(const ObjCImplementationDecl *D); + + // C++ related functions. + void EmitNamespace(const NamespaceDecl *D); void EmitLinkageSpec(const LinkageSpecDecl *D); + + /// EmitCXXConstructors - Emit constructors (base, complete) from a + /// C++ constructor Decl. + void EmitCXXConstructors(const CXXConstructorDecl *D); + + /// EmitCXXConstructor - Emit a single constructor with the given type from + /// a C++ constructor Decl. + void EmitCXXConstructor(const CXXConstructorDecl *D, CXXCtorType Type); // FIXME: Hardcoding priority here is gross. void AddGlobalCtor(llvm::Function * Ctor, int Priority=65535);