commit 78a151138ab52cfb743679285cc4c343bdfa9029
author John McCall <rjmccall@apple.com> Sat May 22 01:48:05 2010 +0000
committer John McCall <rjmccall@apple.com> Sat May 22 01:48:05 2010 +0000
tree 9ec5f913be318ffcd1fafa1713e8223123c64db4
parent 168ced94d84929f7cdb5d61c67ed79e7275f0ec6

Push a return-value slot throughout ObjC message-send codegen.  Will be
critical for ObjC++ correctness;  hard to test independently of various
required Sema changes, though.

llvm-svn: 104422

clang/lib/CodeGen/CGExprAgg.cpp

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 3bf2f8a..aa32bb8 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -37,6 +37,10 @@
   bool IgnoreResult;
   bool IsInitializer;
   bool RequiresGCollection;
+
+  ReturnValueSlot getReturnValueSlot() const {
+    return ReturnValueSlot(DestPtr, VolatileDest);
+  }
 public:
   AggExprEmitter(CodeGenFunction &cgf, llvm::Value *destPtr, bool v,
                  bool ignore, bool isinit, bool requiresGCollection)
@@ -299,7 +303,7 @@
   // If the struct doesn't require GC, we can just pass the destination
   // directly to EmitCall.
   if (!RequiresGCollection) {
-    CGF.EmitCallExpr(E, ReturnValueSlot(DestPtr, VolatileDest));
+    CGF.EmitCallExpr(E, getReturnValueSlot());
     return;
   }
   
@@ -308,19 +312,16 @@
 }
 
 void AggExprEmitter::VisitObjCMessageExpr(ObjCMessageExpr *E) {
-  RValue RV = CGF.EmitObjCMessageExpr(E);
-  EmitFinalDestCopy(E, RV);
+  CGF.EmitObjCMessageExpr(E, getReturnValueSlot());
 }
 
 void AggExprEmitter::VisitObjCPropertyRefExpr(ObjCPropertyRefExpr *E) {
-  RValue RV = CGF.EmitObjCPropertyGet(E);
-  EmitFinalDestCopy(E, RV);
+  CGF.EmitObjCPropertyGet(E, getReturnValueSlot());
 }
 
 void AggExprEmitter::VisitObjCImplicitSetterGetterRefExpr(
                                    ObjCImplicitSetterGetterRefExpr *E) {
-  RValue RV = CGF.EmitObjCPropertyGet(E);
-  EmitFinalDestCopy(E, RV);
+  CGF.EmitObjCPropertyGet(E, getReturnValueSlot());
 }
 
 void AggExprEmitter::VisitBinComma(const BinaryOperator *E) {