From: Fariborz Jahanian Date: Thu, 6 Mar 2014 00:34:05 +0000 (+0000) Subject: Objective-C properties. Fixes a crash in Sema where RHS of X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47a43526f5dc54337348fa55b9b5524d47872c1c;p=clang Objective-C properties. Fixes a crash in Sema where RHS of the property assignment is an lvalue for an incomplete type. // rdar://15118128. Reviewed offline by John McCall. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203043 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaPseudoObject.cpp b/lib/Sema/SemaPseudoObject.cpp index 81657e366e..0f1df58e6d 100644 --- a/lib/Sema/SemaPseudoObject.cpp +++ b/lib/Sema/SemaPseudoObject.cpp @@ -235,7 +235,10 @@ namespace { } /// Return true if assignments have a non-void result. - bool CanCaptureValueOfType(QualType ty) { + bool CanCaptureValue(Expr *exp) { + if (exp->isGLValue()) + return true; + QualType ty = exp->getType(); assert(!ty->isIncompleteType()); assert(!ty->isDependentType()); @@ -461,7 +464,7 @@ PseudoOpBuilder::buildIncDecOperation(Scope *Sc, SourceLocation opcLoc, // That's the postfix result. if (UnaryOperator::isPostfix(opcode) && - (result.get()->isTypeDependent() || CanCaptureValueOfType(resultType))) { + (result.get()->isTypeDependent() || CanCaptureValue(result.get()))) { result = capture(result.take()); setResultToLastSemantic(); } @@ -762,7 +765,7 @@ ExprResult ObjCPropertyOpBuilder::buildSet(Expr *op, SourceLocation opcLoc, ObjCMessageExpr *msgExpr = cast(msg.get()->IgnoreImplicit()); Expr *arg = msgExpr->getArg(0); - if (CanCaptureValueOfType(arg->getType())) + if (CanCaptureValue(arg)) msgExpr->setArg(0, captureValueAsResult(arg)); } @@ -1368,7 +1371,7 @@ ExprResult ObjCSubscriptOpBuilder::buildSet(Expr *op, SourceLocation opcLoc, ObjCMessageExpr *msgExpr = cast(msg.get()->IgnoreImplicit()); Expr *arg = msgExpr->getArg(0); - if (CanCaptureValueOfType(arg->getType())) + if (CanCaptureValue(arg)) msgExpr->setArg(0, captureValueAsResult(arg)); } diff --git a/test/CodeGenObjCXX/property-lvalue-capture.mm b/test/CodeGenObjCXX/property-lvalue-capture.mm new file mode 100644 index 0000000000..a4024fd29a --- /dev/null +++ b/test/CodeGenObjCXX/property-lvalue-capture.mm @@ -0,0 +1,53 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s +// rdar://15118128 + +template struct Quad2 { + Quad2() {} +}; + +typedef Quad2 Quad2d; + +@interface Root @end + +@interface PAGeometryFrame +- (const Quad2d &)quad; +- (void)setQuad:(const Quad2d &)quad; +@end + +@interface PA2DScaleTransform : Root +@end + +@implementation PA2DScaleTransform +- (void)transformFrame:(PAGeometryFrame *)frame { + PAGeometryFrame *result; + result.quad = frame.quad; +} +@end + +// CHECK: [[TWO:%.*]] = load i8** @"\01L_OBJC_SELECTOR_REFERENCES_", !invariant.load !5 +// CHECK: [[THREE:%.*]] = bitcast [[ONET:%.*]]* [[ONE:%.*]] to i8* +// CHECK: [[CALL:%.*]] = call %struct.Quad2* bitcast (i8* (i8*, i8*, ...)* @objc_msgSend to %struct.Quad2* (i8*, i8*)*)(i8* [[THREE]], i8* [[TWO]]) +// CHECK: [[FOUR:%.*]] = load i8** @"\01L_OBJC_SELECTOR_REFERENCES_2", !invariant.load !5 +// CHECK: [[FIVE:%.*]] = bitcast [[ONET]]* [[ZERO:%.*]] to i8* +// CHECK: call void bitcast (i8* (i8*, i8*, ...)* @objc_msgSend to void (i8*, i8*, %struct.Quad2*)*)(i8* [[FIVE]], i8* [[FOUR]], %struct.Quad2* [[CALL]]) + + +struct A { + void *ptr; + A(); + A(const A &); + ~A(); +}; + +@interface C +- (void) setProp: (const A&) value; +@end +void test(C *c, const A &a) { + const A &result = c.prop = a; +} + +// CHECK: [[ONE1:%.*]] = load %struct.A** [[AADDR:%.*]], align 8 +// CHECK: [[TWO1:%.*]] = load i8** @"\01L_OBJC_SELECTOR_REFERENCES_5", !invariant.load !5 +// CHECK: [[THREE1:%.*]] = bitcast [[TWOT:%.*]]* [[ZERO1:%.*]] to i8* +// CHECK: call void bitcast (i8* (i8*, i8*, ...)* @objc_msgSend to void (i8*, i8*, %struct.A*)*)(i8* [[THREE1]], i8* [[TWO1]], %struct.A* [[ONE1]]) +// CHECK: store %struct.A* [[ONE1]], %struct.A** [[RESULT:%.*]], align 8