diff options
| -rw-r--r-- | lib/CodeGen/CGObjC.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGenObjCXX/property-object-reference-1.mm | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp index 4e5915a3ae..58319cf579 100644 --- a/lib/CodeGen/CGObjC.cpp +++ b/lib/CodeGen/CGObjC.cpp @@ -752,7 +752,8 @@ static void emitStructSetterCall(CodeGenFunction &CGF, ObjCMethodDecl *OMD, // The second argument is the address of the parameter variable. ParmVarDecl *argVar = *OMD->param_begin(); - DeclRefExpr argRef(argVar, argVar->getType(), VK_LValue, SourceLocation()); + DeclRefExpr argRef(argVar, argVar->getType().getNonReferenceType(), + VK_LValue, SourceLocation()); llvm::Value *argAddr = CGF.EmitLValue(&argRef).getAddress(); argAddr = CGF.Builder.CreateBitCast(argAddr, CGF.Int8PtrTy); args.add(RValue::get(argAddr), CGF.getContext().VoidPtrTy); diff --git a/test/CodeGenObjCXX/property-object-reference-1.mm b/test/CodeGenObjCXX/property-object-reference-1.mm new file mode 100644 index 0000000000..79bf9e4f31 --- /dev/null +++ b/test/CodeGenObjCXX/property-object-reference-1.mm @@ -0,0 +1,31 @@ +// RUN: %clang_cc1 -x objective-c++ %s -triple x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s +// rdar://6137845 + +struct TCPPObject +{ + TCPPObject(const TCPPObject& inObj); + TCPPObject(); + ~TCPPObject(); + int filler[64]; +}; + + +@interface MyDocument +{ +@private + TCPPObject _cppObject; +} +@property (atomic, assign, readwrite) const TCPPObject& cppObject; +@end + +@implementation MyDocument + +@synthesize cppObject = _cppObject; + +@end + +// CHECK: [[cppObjectaddr:%.*]] = alloca %struct.TCPPObject*, align 8 +// CHECK: store %struct.TCPPObject* [[cppObject:%.*]], %struct.TCPPObject** [[cppObjectaddr]], align 8 +// CHECK: [[THREE:%.*]] = load %struct.TCPPObject** [[cppObjectaddr]], align 8 +// CHECK: [[FOUR:%.*]] = bitcast %struct.TCPPObject* [[THREE]] to i8* +// CHECK: call void @objc_copyStruct(i8* [[TWO:%.*]], i8* [[FOUR]], i64 256, i1 zeroext true, i1 zeroext false) |