commit d70b09cb98cb6200eb72d89c9d2d17ad7a8068ea
author Fariborz Jahanian <fjahanian@apple.com> Wed Nov 26 22:36:09 2008 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Nov 26 22:36:09 2008 +0000
tree 7bd80524abc090c201036c7ac88d31b8a409aac5
parent fc33232adf097e0e8311ba6ff3c2d529d9340691

Code gen for aggregate-valued properties and a test case.



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

lib/CodeGen/CGObjC.cpp

diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp
index 1157f48..e95d8e1 100644
--- a/lib/CodeGen/CGObjC.cpp
+++ b/lib/CodeGen/CGObjC.cpp
@@ -187,10 +187,13 @@
                                            Types.ConvertType(PD->getType())));
     EmitReturnOfRValue(RV, PD->getType());
   } else {
-    EmitReturnOfRValue(EmitLoadOfLValue(EmitLValueForIvar(LoadObjCSelf(), 
-                                                          Ivar, 0), 
-                                        Ivar->getType()), 
-                       PD->getType());
+    LValue LV = EmitLValueForIvar(LoadObjCSelf(), Ivar, 0);
+    if (hasAggregateLLVMType(Ivar->getType())) {
+      EmitAggregateCopy(ReturnValue, LV.getAddress(), Ivar->getType());
+    }
+    else
+      EmitReturnOfRValue(EmitLoadOfLValue(LV, Ivar->getType()), 
+                                          PD->getType());
   }
 
   FinishFunction();