From 7cc52cf09f93bbc05f24b6f6fd3572a18d48c6da Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Mon, 10 Aug 2009 18:34:26 +0000 Subject: [PATCH] ir-gen for generating copying of scalar data members in a synthesized copy constructor. llvm-svn: 78580 --- clang/lib/CodeGen/CGCXX.cpp | 6 +++++- .../test/CodeGenCXX/copy-constructor-synthesis.cpp | 13 +++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp index 55693d1073d9..8f6cfc05ddcd 100644 --- a/clang/lib/CodeGen/CGCXX.cpp +++ b/clang/lib/CodeGen/CGCXX.cpp @@ -855,7 +855,11 @@ void CodeGenFunction::SynthesizeCXXCopyConstructor(const CXXConstructorDecl *CD, 0 /*ClassDecl*/, FieldClassDecl, FieldType); continue; } - // FIXME. Do a built-in assignment of scalar data members. + // Do a built-in assignment of scalar data members. + LValue LHS = EmitLValueForField(LoadOfThis, *Field, false, 0); + LValue RHS = EmitLValueForField(LoadOfSrc, *Field, false, 0); + RValue RVRHS = EmitLoadOfLValue(RHS, FieldType); + EmitStoreThroughLValue(RVRHS, LHS, FieldType); } FinishFunction(); } diff --git a/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp b/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp index a993926f190b..851a4ea60a56 100644 --- a/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp +++ b/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp @@ -26,12 +26,21 @@ struct P { struct X : M, N, P { // ... - X(){} + X() : f1(1.0), d1(2.0), i1(3), name("HELLO"), bf1(0xff), bf2(0xabcd) {} P p0; void pr() { printf("iM = %d iN = %d, m1.iM = %d\n", iM, iN, m1.iM); - printf("im = %d p0.iP = %d, p1.iP = %d\n", iP, p0.iP, p1.iP); } + printf("im = %d p0.iP = %d, p1.iP = %d\n", iP, p0.iP, p1.iP); + printf("f1 = %f d1 = %f i1 = %d name(%s) \n", f1, d1, i1, name); + printf("bf1 = %x bf2 = %x\n", bf1, bf2); + } M m1; P p1; + float f1; + double d1; + int i1; + const char *name; + unsigned bf1 : 8; + unsigned bf2 : 16; }; int main()