[cfe-commits] r78570 - in /cfe/trunk: lib/CodeGen/CGCXX.cpp test/CodeGenCXX/copy-constructor-synthesis.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Aug 10 12:20:45 2009
New Revision: 78570

URL: http://llvm.org/viewvc/llvm-project?rev=78570&view=rev
Log:
Fixed a ir-gen bug in synthesizing copy constructors.


Modified:
    cfe/trunk/lib/CodeGen/CGCXX.cpp
    cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis.cpp

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

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXX.cpp Mon Aug 10 12:20:45 2009
@@ -784,7 +784,7 @@
     
     // Push the Src ptr.
     CallArgs.push_back(std::make_pair(RValue::get(Src),
-                                      BaseCopyCtor->getThisType(getContext())));
+                       BaseCopyCtor->getParamDecl(0)->getType()));
     QualType ResultType = 
     BaseCopyCtor->getType()->getAsFunctionType()->getResultType();
     EmitCall(CGM.getTypes().getFunctionInfo(ResultType, CallArgs),

Modified: cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis.cpp?rev=78570&r1=78569&r2=78570&view=diff

==============================================================================
--- cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/copy-constructor-synthesis.cpp Mon Aug 10 12:20:45 2009
@@ -1,5 +1,5 @@
-// RUNX: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s &&
-// RUNX: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
+// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s &&
+// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
 // RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s &&
 // RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
 // RUN: true
@@ -43,12 +43,9 @@
 	X c(x);
         c.pr();
 }
-#if 0
-// -m64 does not work due to unrelated llvm bug!
 // CHECK-LP64: .globl  __ZN1XC1ERK1X
 // CHECK-LP64: .weak_definition __ZN1XC1ERK1X
 // CHECK-LP64: __ZN1XC1ERK1X:
-#endif
 
 // CHECK-LP32: .globl  __ZN1XC1ERK1X
 // CHECK-LP32: .weak_definition __ZN1XC1ERK1X