[cfe-commits] r78965 - in /cfe/trunk: lib/CodeGen/CGCXX.cpp lib/CodeGen/CodeGenModule.cpp test/CodeGenCXX/copy-assign-synthesis-1.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Aug 13 19:01:54 2009
New Revision: 78965

URL: http://llvm.org/viewvc/llvm-project?rev=78965&view=rev
Log:
Fixed a bug in ir-gen for copy assignment synthesis.
Fixed a bug when evaluating those copy-assignments
which need by lazily syntheized. A test case
for these.

Added:
    cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-1.cpp
Modified:
    cfe/trunk/lib/CodeGen/CGCXX.cpp
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CGCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCXX.cpp?rev=78965&r1=78964&r2=78965&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXX.cpp Thu Aug 13 19:01:54 2009
@@ -1045,7 +1045,10 @@
     LValue RHS = EmitLValueForField(LoadOfSrc, *Field, false, 0);
     RValue RVRHS = EmitLoadOfLValue(RHS, FieldType);
     EmitStoreThroughLValue(RVRHS, LHS, FieldType);
-  }  
+  }
+  
+  // return *this;
+  Builder.CreateStore(LoadOfThis, ReturnValue);
   
   FinishFunction();
 }  

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=78965&r1=78964&r2=78965&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Thu Aug 13 19:01:54 2009
@@ -739,7 +739,9 @@
     CXXRecordDecl *BaseClassDecl
       = cast<CXXRecordDecl>(Base->getType()->getAs<RecordType>()->getDecl());
     const CXXMethodDecl *MD = 0;
-    if (BaseClassDecl->hasConstCopyAssignment(getContext(), MD))
+    if (!BaseClassDecl->hasTrivialCopyAssignment() &&
+        !BaseClassDecl->hasUserDeclaredCopyAssignment() &&
+        BaseClassDecl->hasConstCopyAssignment(getContext(), MD))
       GetAddrOfFunction(GlobalDecl(MD), 0);
   }
   
@@ -755,7 +757,9 @@
       CXXRecordDecl *FieldClassDecl
         = cast<CXXRecordDecl>(FieldClassType->getDecl());
       const CXXMethodDecl *MD = 0;
-      if (FieldClassDecl->hasConstCopyAssignment(getContext(), MD))
+      if (!FieldClassDecl->hasTrivialCopyAssignment() &&
+          !FieldClassDecl->hasUserDeclaredCopyAssignment() &&
+          FieldClassDecl->hasConstCopyAssignment(getContext(), MD))
           GetAddrOfFunction(GlobalDecl(MD), 0);
     }
   }

Added: cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-1.cpp?rev=78965&view=auto

==============================================================================
--- cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-1.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/copy-assign-synthesis-1.cpp Thu Aug 13 19:01:54 2009
@@ -0,0 +1,100 @@
+// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s &&
+// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
+// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s &&
+// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
+// RUN: true
+
+extern "C" int printf(...);
+
+struct B {
+  B() : B1(3.14), B2(3.15), auB2(3.16)  {} 
+  float B1;
+  float B2;
+  void pr() {
+    printf("B1 = %f B2 = %f auB1 = %f\n", B1, B2, auB1);
+  }
+
+  B& operator=(const B& arg) { B1 = arg.B1; B2 = arg.B2; 
+                               auB1 = arg.auB1; return *this; }
+  union {
+    float auB1;
+    float auB2;
+  };
+};
+
+struct M {
+  M() : M1(10), M2(11) , auM1(12) {} 
+  int M1;
+  int M2;
+  void pr() {
+    printf("M1 = %d M2 = %d auM1 = %d auM2 = %d\n", M1, M2, auM1, auM2);
+  }
+  union {
+    int auM1;
+    int auM2;
+  };
+};
+
+struct N  : B {
+  N() : N1(20), N2(21) {} 
+  int N1;
+  int N2;
+  void pr() {
+    printf("N1 = %d N2 = %d\n", N1, N2);
+    B::pr();
+  }
+  N& operator=(const N& arg) { N1 = arg.N1; N2 = arg.N2; 
+                               return *this; }
+};
+
+struct Q  : B {
+  Q() : Q1(30), Q2(31) {} 
+  int Q1;
+  int Q2;
+  void pr() {
+    printf("Q1 = %d Q2 = %d\n", Q1, Q2);
+  }
+};
+
+
+struct X : M , N { 
+  X() : d(0.0), d1(1.1), d2(1.2), d3(1.3) {}
+  double d;
+  double d1;
+  double d2;
+  double d3;
+  void pr() {
+    printf("d = %f d1 = %f d2 = %f d3 = %f\n", d, d1,d2,d3);
+    M::pr(); N::pr();
+    q1.pr(); q2.pr();
+  }
+
+ Q q1, q2;
+}; 
+
+
+X srcX; 
+X dstX; 
+X dstY; 
+
+int main() {
+  dstY = dstX = srcX;
+  srcX.pr();
+  dstX.pr();
+  dstY.pr();
+}
+
+// CHECK-LP64: .globl   __ZN1XaSERK1X
+// CHECK-LP64: .weak_definition  __ZN1XaSERK1X
+// CHECK-LP64: __ZN1XaSERK1X:
+// CHECK-LP64: .globl   __ZN1QaSERK1Q
+// CHECK-LP64: .weak_definition  __ZN1QaSERK1Q
+// CHECK-LP64: __ZN1QaSERK1Q:
+
+// CHECK-LP32: .globl   __ZN1XaSERK1X
+// CHECK-LP32: .weak_definition  __ZN1XaSERK1X
+// CHECK-LP32: __ZN1XaSERK1X:
+// CHECK-LP32: .globl   __ZN1QaSERK1Q
+// CHECK-LP32: .weak_definition  __ZN1QaSERK1Q
+// CHECK-LP32: __ZN1QaSERK1Q:
+