diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-04-05 23:01:27 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-04-05 23:01:27 +0000 |
| commit | 5fb6509b402d052aa661b15bfa5b71b7cdd7d0e9 (patch) | |
| tree | b476cb80fdb0530ab664686603650e7780b3fade | |
| parent | 5ecb1dfb303c58138fdabeea00e73bee075b21ee (diff) | |
Fixes a regression caused by my last patch.
As a result, I had to remove a c++ version of a clang
test which requires more scrutiny on my part.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128950 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGObjC.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGenObjC/atomic-aggregate-property.m | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp index 78305c6ddc..fed19b4267 100644 --- a/lib/CodeGen/CGObjC.cpp +++ b/lib/CodeGen/CGObjC.cpp @@ -287,7 +287,7 @@ void CodeGenFunction::GenerateObjCGetter(ObjCImplementationDecl *IMP, } else if (hasAggregateLLVMType(IVART)) { bool IsStrong = false; - if ((IsAtomic || (IsStrong = IvarTypeWithAggrGCObjects(IVART))) + if ((IsStrong = IvarTypeWithAggrGCObjects(IVART)) && CurFnInfo->getReturnInfo().getKind() == ABIArgInfo::Indirect && CGM.getObjCRuntime().GetGetStructFunction()) { GenerateObjCGetterBody(Ivar, IsAtomic, IsStrong); @@ -448,6 +448,7 @@ void CodeGenFunction::GenerateObjCSetter(ObjCImplementationDecl *IMP, ReturnValueSlot(), Args); } else if (IsAtomic && hasAggregateLLVMType(IVART) && !IVART->isAnyComplexType() && + !PID->getGetterCXXConstructor() && ((Triple.getArch() == llvm::Triple::x86 && (getContext().getTypeSizeInChars(IVART) > CharUnits::fromQuantity(4))) || diff --git a/test/CodeGenObjC/atomic-aggregate-property.m b/test/CodeGenObjC/atomic-aggregate-property.m index 93eeca8201..2896d379e7 100644 --- a/test/CodeGenObjC/atomic-aggregate-property.m +++ b/test/CodeGenObjC/atomic-aggregate-property.m @@ -1,5 +1,4 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s -// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fobjc-gc -emit-llvm -o - %s | FileCheck -check-prefix LP64 %s // rdar: // 7849824 struct s { |