diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2008-11-26 22:36:09 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2008-11-26 22:36:09 +0000 |
| commit | 57251782d0345403f89e8615b060486b37538501 (patch) | |
| tree | fc3d403a391fd75f838639ab48c40e9b91e267f2 /clang/lib/CodeGen/CGObjC.cpp | |
| parent | 397a11ccd8adcd854487eea278e2ea29cc7b24d3 (diff) | |
| download | bcm5719-llvm-57251782d0345403f89e8615b060486b37538501.tar.gz bcm5719-llvm-57251782d0345403f89e8615b060486b37538501.zip | |
Code gen for aggregate-valued properties and a test case.
llvm-svn: 60122
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index 1157f48d39d..e95d8e1e566 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -187,10 +187,13 @@ void CodeGenFunction::GenerateObjCGetter(const ObjCPropertyImplDecl *PID) { 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(); |
