commit b3ebe946d3bf1e06d3ccbecd11cc16c75b128342
author Fariborz Jahanian <fjahanian@apple.com> Mon May 10 22:57:35 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Mon May 10 22:57:35 2010 +0000
tree 2e7e309a5d3c0b7961dd51841252a6afc8be5845
parent 45d9c2d2b1b4ada29160edadc071db9779c0ec07

Objective-C++ Code gen. Handle code gen. for property
reference dot-syntax notation in a varierty of cases.
Fixes radar 7964490.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103440 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 9ade916..8b8b659 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1670,7 +1670,16 @@
                             MakeQualifiers(E->getType()));
   }
 
-  case CastExpr::CK_NoOp:
+  case CastExpr::CK_NoOp: {
+    LValue LV = EmitLValue(E->getSubExpr());
+    // FIXME. assign a meaningfull cast kind.
+    if (LV.isPropertyRef()) {
+      RValue RV = EmitLoadOfPropertyRefLValue(LV, E->getSubExpr()->getType());
+      llvm::Value *V = RV.isScalar() ? RV.getScalarVal() : RV.getAggregateAddr();
+      return LValue::MakeAddr(V, MakeQualifiers(E->getSubExpr()->getType()));
+    }
+    return LV;
+  }
   case CastExpr::CK_ConstructorConversion:
   case CastExpr::CK_UserDefinedConversion:
   case CastExpr::CK_AnyPointerToObjCPointerCast:

lib/CodeGen/CGExprCXX.cpp

diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp
index 5714a3e..2b0938a 100644
--- a/lib/CodeGen/CGExprCXX.cpp
+++ b/lib/CodeGen/CGExprCXX.cpp
@@ -261,7 +261,16 @@
     if (ClassDecl->hasTrivialCopyAssignment()) {
       assert(!ClassDecl->hasUserDeclaredCopyAssignment() &&
              "EmitCXXOperatorMemberCallExpr - user declared copy assignment");
-      llvm::Value *This = EmitLValue(E->getArg(0)).getAddress();
+      LValue LV = EmitLValue(E->getArg(0));
+      llvm::Value *This;
+      if (LV.isPropertyRef()) {
+        RValue RV = EmitLoadOfPropertyRefLValue(LV, E->getArg(0)->getType());
+        assert (!RV.isScalar() && "EmitCXXOperatorMemberCallExpr");
+        This = RV.getAggregateAddr();
+      }
+      else
+        This = LV.getAddress();
+      
       llvm::Value *Src = EmitLValue(E->getArg(1)).getAddress();
       QualType Ty = E->getType();
       EmitAggregateCopy(This, Src, Ty);

test/CodeGenObjCXX/property-objects.mm

diff --git a/test/CodeGenObjCXX/property-objects.mm b/test/CodeGenObjCXX/property-objects.mm
index cd327c2..a4cae08 100644
--- a/test/CodeGenObjCXX/property-objects.mm
+++ b/test/CodeGenObjCXX/property-objects.mm
@@ -1,6 +1,7 @@
 // RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
 // CHECK: call void @_ZN1SC1ERKS_
 // CHECK: call %class.S* @_ZN1SaSERKS_
+// CHECK: call %class.S* @_ZN6CGRectaSERKS_
 
 class S {
 public:
@@ -9,14 +10,26 @@
 	S ();
 };
 
+struct CGRect {
+	CGRect & operator = (const CGRect &);
+};
+
 @interface I {
   S position;
+  CGRect bounds;
 }
 @property(assign, nonatomic) S position;
+@property CGRect bounds;
+- (void) initWithOwner;
 @end
 
 @implementation I
 @synthesize position;
+@synthesize bounds;
+- (void)initWithOwner {
+  CGRect labelLayerFrame = self.bounds;
+  labelLayerFrame = self.bounds;
+}
 @end
 
 int main() {