diff options
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 23 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 6 |
2 files changed, 21 insertions, 8 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index 22c099f8dc..0f155ec648 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -240,13 +240,22 @@ void CodeGenFunction::GenerateCode(const FunctionDecl *FD, } else if (const CXXConstructorDecl *CD = dyn_cast<CXXConstructorDecl>(FD)) { - assert( - !cast<CXXRecordDecl>(CD->getDeclContext())-> - hasUserDeclaredConstructor() && - "bogus constructor is being synthesize"); - StartFunction(FD, FD->getResultType(), Fn, Args, SourceLocation()); - EmitCtorPrologue(CD); - FinishFunction(); + const CXXRecordDecl *ClassDecl = + cast<CXXRecordDecl>(CD->getDeclContext()); + (void) ClassDecl; + if (CD->isCopyConstructor(getContext())) { + assert(!ClassDecl->hasUserDeclaredCopyConstructor() && + "bogus constructor is being synthesize"); + StartFunction(FD, FD->getResultType(), Fn, Args, SourceLocation()); + FinishFunction(); + } + else { + assert(!ClassDecl->hasUserDeclaredConstructor() && + "bogus constructor is being synthesize"); + StartFunction(FD, FD->getResultType(), Fn, Args, SourceLocation()); + EmitCtorPrologue(CD); + FinishFunction(); + } } // Destroy the 'this' declaration. diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 249764e9d9..8e53651c8e 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -645,7 +645,11 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(const char *MangledName, else if (const CXXConstructorDecl *CD = dyn_cast<CXXConstructorDecl>(FD)) { const CXXRecordDecl *ClassDecl = cast<CXXRecordDecl>(CD->getDeclContext()); - if (!ClassDecl->hasUserDeclaredConstructor()) + if (CD->isCopyConstructor(getContext())) { + if (!ClassDecl->hasUserDeclaredCopyConstructor()) + DeferredDeclsToEmit.push_back(D); + } + else if (!ClassDecl->hasUserDeclaredConstructor()) DeferredDeclsToEmit.push_back(D); } } |