forked from OSchip/llvm-project
In ARC, non-atomic getters do not need to retain and autorelease
their loaded values, although it still worth doing this for __weak properties to get the autoreleased-return-value optimization. llvm-svn: 135747
This commit is contained in:
parent
0410e572b9
commit
24fada127f
|
@ -465,27 +465,30 @@ void CodeGenFunction::GenerateObjCGetter(ObjCImplementationDecl *IMP,
|
|||
EmitAggregateCopy(ReturnValue, LV.getAddress(), IVART);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
LValue LV = EmitLValueForIvar(TypeOfSelfObject(), LoadObjCSelf(),
|
||||
Ivar, 0);
|
||||
QualType propType = PD->getType();
|
||||
} else {
|
||||
LValue LV = EmitLValueForIvar(TypeOfSelfObject(), LoadObjCSelf(),
|
||||
Ivar, 0);
|
||||
QualType propType = PD->getType();
|
||||
|
||||
llvm::Value *value;
|
||||
if (propType->isReferenceType()) {
|
||||
value = LV.getAddress();
|
||||
llvm::Value *value;
|
||||
if (propType->isReferenceType()) {
|
||||
value = LV.getAddress();
|
||||
} else {
|
||||
// We want to load and autoreleaseReturnValue ARC __weak ivars.
|
||||
if (LV.getQuals().getObjCLifetime() == Qualifiers::OCL_Weak) {
|
||||
value = emitARCRetainLoadOfScalar(*this, LV, IVART);
|
||||
|
||||
// Otherwise we want to do a simple load, suppressing the
|
||||
// final autorelease.
|
||||
} else {
|
||||
// In ARC, we want to emit this retained.
|
||||
if (getLangOptions().ObjCAutoRefCount &&
|
||||
PD->getType()->isObjCRetainableType())
|
||||
value = emitARCRetainLoadOfScalar(*this, LV, IVART);
|
||||
else
|
||||
value = EmitLoadOfLValue(LV).getScalarVal();
|
||||
|
||||
value = Builder.CreateBitCast(value, ConvertType(propType));
|
||||
value = EmitLoadOfLValue(LV).getScalarVal();
|
||||
AutoreleaseResult = false;
|
||||
}
|
||||
|
||||
EmitReturnOfRValue(RValue::get(value), propType);
|
||||
value = Builder.CreateBitCast(value, ConvertType(propType));
|
||||
}
|
||||
|
||||
EmitReturnOfRValue(RValue::get(value), propType);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1578,3 +1578,41 @@ void test56_test(void) {
|
|||
// CHECK-NEXT: call void @objc_release(i8* [[T0]])
|
||||
// CHECK-NEXT: ret void
|
||||
}
|
||||
|
||||
// rdar://problem/9784964
|
||||
@interface Test57
|
||||
@property (nonatomic, strong) id strong;
|
||||
@property (nonatomic, weak) id weak;
|
||||
@property (nonatomic, unsafe_unretained) id unsafe;
|
||||
@end
|
||||
@implementation Test57
|
||||
@synthesize strong, weak, unsafe;
|
||||
@end
|
||||
// CHECK: define internal i8* @"\01-[Test57 strong]"(
|
||||
// CHECK: [[T0:%.*]] = load [[TEST57:%.*]]** {{%.*}}
|
||||
// CHECK-NEXT: [[T1:%.*]] = load i64* @"OBJC_IVAR_$_Test57.strong"
|
||||
// CHECK-NEXT: [[T2:%.*]] = bitcast [[TEST57]]* [[T0]] to i8*
|
||||
// CHECK-NEXT: [[T3:%.*]] = getelementptr inbounds i8* [[T2]], i64 [[T1]]
|
||||
// CHECK-NEXT: [[T4:%.*]] = bitcast i8* [[T3]] to i8**
|
||||
// CHECK-NEXT: [[T5:%.*]] = load i8** [[T4]]
|
||||
// CHECK-NEXT: ret i8* [[T5]]
|
||||
|
||||
// CHECK: define internal i8* @"\01-[Test57 weak]"(
|
||||
// CHECK: [[T0:%.*]] = load [[TEST57]]** {{%.*}}
|
||||
// CHECK-NEXT: [[T1:%.*]] = load i64* @"OBJC_IVAR_$_Test57.weak"
|
||||
// CHECK-NEXT: [[T2:%.*]] = bitcast [[TEST57]]* [[T0]] to i8*
|
||||
// CHECK-NEXT: [[T3:%.*]] = getelementptr inbounds i8* [[T2]], i64 [[T1]]
|
||||
// CHECK-NEXT: [[T4:%.*]] = bitcast i8* [[T3]] to i8**
|
||||
// CHECK-NEXT: [[T5:%.*]] = call i8* @objc_loadWeakRetained(i8** [[T4]])
|
||||
// CHECK-NEXT: [[T6:%.*]] = call i8* @objc_autoreleaseReturnValue(i8* [[T5]])
|
||||
// CHECK-NEXT: ret i8* [[T6]]
|
||||
|
||||
// CHECK: define internal i8* @"\01-[Test57 unsafe]"(
|
||||
// CHECK: [[T0:%.*]] = load [[TEST57]]** {{%.*}}
|
||||
// CHECK-NEXT: [[T1:%.*]] = load i64* @"OBJC_IVAR_$_Test57.unsafe"
|
||||
// CHECK-NEXT: [[T2:%.*]] = bitcast [[TEST57]]* [[T0]] to i8*
|
||||
// CHECK-NEXT: [[T3:%.*]] = getelementptr inbounds i8* [[T2]], i64 [[T1]]
|
||||
// CHECK-NEXT: [[T4:%.*]] = bitcast i8* [[T3]] to i8**
|
||||
// CHECK-NEXT: [[T5:%.*]] = load i8** [[T4]]
|
||||
// CHECK-NEXT: ret i8* [[T5]]
|
||||
|
||||
|
|
Loading…
Reference in New Issue