commit 0ca0b1f4b4a73e888c42c930dab464885afcd09a
author Fariborz Jahanian <fjahanian@apple.com> Sat May 15 23:05:52 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat May 15 23:05:52 2010 +0000
tree f8db020eb37ed91a589102b8633c3087a27c1904
parent bfcc823a5c53dabab8cfc842bfea70e2b69cdee0

Fix API gen for objc_msgSend property of aggregate types
in Objective-c++ mode. Fixes radar 7986354.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103887 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExprCXX.cpp

diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp
index 22626fc..06d26a4 100644
--- a/lib/CodeGen/CGExprCXX.cpp
+++ b/lib/CodeGen/CGExprCXX.cpp
@@ -264,9 +264,11 @@
       LValue LV = EmitLValue(E->getArg(0));
       llvm::Value *This;
       if (LV.isPropertyRef()) {
-        RValue RV = EmitLoadOfPropertyRefLValue(LV, E->getArg(0)->getType());
-        assert (!RV.isScalar() && "EmitCXXOperatorMemberCallExpr");
-        This = RV.getAggregateAddr();
+        llvm::Value *AggLoc  = CreateMemTemp(E->getArg(0)->getType());
+        EmitAggExpr(E->getArg(1), AggLoc, false /*VolatileDest*/);
+        EmitObjCPropertySet(LV.getPropertyRefExpr(),
+                            RValue::getAggregate(AggLoc, false /*VolatileDest*/));
+        return RValue::getAggregate(0, false);
       }
       else
         This = LV.getAddress();
@@ -285,9 +287,11 @@
   LValue LV = EmitLValue(E->getArg(0));
   llvm::Value *This;
   if (LV.isPropertyRef()) {
-    RValue RV = EmitLoadOfPropertyRefLValue(LV, E->getArg(0)->getType());
-    assert (!RV.isScalar() && "EmitCXXOperatorMemberCallExpr");
-    This = RV.getAggregateAddr();
+    llvm::Value *AggLoc  = CreateMemTemp(E->getArg(0)->getType());
+    EmitAggExpr(E->getArg(1), AggLoc, false /*VolatileDest*/);
+    EmitObjCPropertySet(LV.getPropertyRefExpr(),
+                        RValue::getAggregate(AggLoc, false /*VolatileDest*/));
+    return RValue::getAggregate(0, false);
   }
   else
     This = LV.getAddress();