Patch fixes miscompile with non-trivial copy constructors and

statement expressions, //rdar: //8540501

llvm-svn: 117146

1 files changed, 8 insertions, 1 deletions

diff --git a/clang/lib/CodeGen/CGValue.h b/clang/lib/CodeGen/CGValue.h
index a000b223311..fd82be75580 100644
--- a/clang/lib/CodeGen/CGValue.h
+++ b/clang/lib/CodeGen/CGValue.h
@@ -26,6 +26,7 @@ namespace llvm {
 namespace clang {
   class ObjCPropertyRefExpr;
   class ObjCImplicitSetterGetterRefExpr;
+  class CXXConstructExpr;
 
 namespace CodeGen {
   class CGBitFieldInfo;
@@ -335,6 +336,7 @@ public:
 class AggValueSlot {
   /// The address.
   llvm::Value *Addr;
+  CXXConstructExpr *CtorExpr;
   
   // Associated flags.
   bool VolatileFlag : 1;
@@ -347,6 +349,7 @@ public:
   static AggValueSlot ignored() {
     AggValueSlot AV;
     AV.Addr = 0;
+    AV.CtorExpr = 0;
     AV.VolatileFlag = AV.LifetimeFlag = AV.RequiresGCollection = 0;
     return AV;
   }
@@ -364,6 +367,7 @@ public:
                               bool RequiresGCollection=false) {
     AggValueSlot AV;
     AV.Addr = Addr;
+    AV.CtorExpr = 0;
     AV.VolatileFlag = Volatile;
     AV.LifetimeFlag = LifetimeExternallyManaged;
     AV.RequiresGCollection = RequiresGCollection;
@@ -375,7 +379,10 @@ public:
     return forAddr(LV.getAddress(), LV.isVolatileQualified(),
                    LifetimeExternallyManaged, RequiresGCollection);
   }
-
+  
+  void setCtorExpr(CXXConstructExpr *E) { CtorExpr = E; }
+  CXXConstructExpr *getCtorExpr() const { return CtorExpr; }
+  
   bool isLifetimeExternallyManaged() const {
     return LifetimeFlag;
   }