commit 09772396cb7b6c47b05858ae74e78b113adf3821
author Fariborz Jahanian <fjahanian@apple.com> Sat Dec 13 22:20:28 2008 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat Dec 13 22:20:28 2008 +0000
tree 4ed3ba9e6973946378a7802441e18e217cad57f4
parent f5da325cb01fdcc7f21feaf721deb8bfffb7ff96

Patch for ObjCIvarRefExpr containing the field
matching the storage layout for this ivar


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

lib/AST/DeclObjC.cpp

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index e3e4548..f22b5b4 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -363,7 +363,21 @@
   setLocEnd(RBrac);
 }
 
-/// addInstanceVariablesToClass - produces layout info. for the class for its
+/// lookupFieldDeclForIvar - looks up a field decl' in the laid out
+/// storage which matches this 'ivar'.
+///
+FieldDecl *ObjCInterfaceDecl::lookupFieldDeclForIvar(ASTContext &Context, 
+                                                     ObjCIvarDecl *ivar) {
+  assert(RecordForDecl && "lookupFieldDeclForIvar no storage for class");
+  DeclarationName Member = ivar->getDeclName();
+  DeclContext::lookup_result Lookup = RecordForDecl->lookup(Context, Member);
+  assert((Lookup.first != Lookup.second) && "field decl not found");
+  FieldDecl *MemberDecl = dyn_cast<FieldDecl>(*Lookup.first);
+  assert(MemberDecl && "field decl not found");
+  return MemberDecl;
+}
+
+/// addLayoutToClass - produces layout info. for the class for its
 /// ivars and all those inherited.
 ///
 void ObjCInterfaceDecl::addLayoutToClass(ASTContext &Context)

lib/AST/StmtSerialization.cpp

diff --git a/lib/AST/StmtSerialization.cpp b/lib/AST/StmtSerialization.cpp
index 9b6207b..aea3d99 100644
--- a/lib/AST/StmtSerialization.cpp
+++ b/lib/AST/StmtSerialization.cpp
@@ -1162,7 +1162,7 @@
 ObjCIvarRefExpr* ObjCIvarRefExpr::CreateImpl(Deserializer& D, ASTContext& C) {
   SourceLocation Loc = SourceLocation::ReadVal(D);
   QualType T = QualType::ReadVal(D);
-  ObjCIvarRefExpr* dr = new ObjCIvarRefExpr(NULL,T,Loc);
+  ObjCIvarRefExpr* dr = new ObjCIvarRefExpr(NULL,NULL,T,Loc);
   D.ReadPtr(dr->D,false);  
   return dr;
 }

lib/CodeGen/CGObjC.cpp

diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp
index e605065..f955782 100644
--- a/lib/CodeGen/CGObjC.cpp
+++ b/lib/CodeGen/CGObjC.cpp
@@ -272,7 +272,9 @@
     DeclRefExpr Base(Self, Self->getType(), Loc);
     ParmVarDecl *ArgDecl = OMD->getParamDecl(0);
     DeclRefExpr Arg(ArgDecl, ArgDecl->getType(), Loc);
-    ObjCIvarRefExpr IvarRef(Ivar, Ivar->getType(), Loc, &Base,
+    ObjCInterfaceDecl *OI = IMP->getClassInterface();
+    FieldDecl *FD = OI->lookupFieldDeclForIvar(getContext(), Ivar);
+    ObjCIvarRefExpr IvarRef(Ivar, FD, Ivar->getType(), Loc, &Base,
                             true, true);
     BinaryOperator Assign(&IvarRef, &Arg, BinaryOperator::Assign,
                           Ivar->getType(), Loc);

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 264b85b..98afb0f 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -418,11 +418,12 @@
     if (SD == 0 || SD->isDefinedOutsideFunctionOrMethod()) {
       ObjCInterfaceDecl *IFace = getCurMethodDecl()->getClassInterface();
       if (ObjCIvarDecl *IV = IFace->lookupInstanceVariable(II)) {
+        FieldDecl *FD = IFace->lookupFieldDeclForIvar(Context, IV);
         // FIXME: This should use a new expr for a direct reference, don't turn
         // this into Self->ivar, just return a BareIVarExpr or something.
         IdentifierInfo &II = Context.Idents.get("self");
         ExprResult SelfExpr = ActOnIdentifierExpr(S, Loc, II, false);
-        return new ObjCIvarRefExpr(IV, IV->getType(), Loc, 
+        return new ObjCIvarRefExpr(IV, FD, IV->getType(), Loc, 
                                  static_cast<Expr*>(SelfExpr.Val), true, true);
       }
     }
@@ -1264,9 +1265,11 @@
   // Handle access to Objective-C instance variables, such as "Obj->ivar" and
   // (*Obj).ivar.
   if (const ObjCInterfaceType *IFTy = BaseType->getAsObjCInterfaceType()) {
-    if (ObjCIvarDecl *IV = IFTy->getDecl()->lookupInstanceVariable(&Member))
-      return new ObjCIvarRefExpr(IV, IV->getType(), MemberLoc, BaseExpr, 
+    if (ObjCIvarDecl *IV = IFTy->getDecl()->lookupInstanceVariable(&Member)) {
+      FieldDecl *FD = IFTy->getDecl()->lookupFieldDeclForIvar(Context, IV);
+      return new ObjCIvarRefExpr(IV, FD, IV->getType(), MemberLoc, BaseExpr, 
                                  OpKind == tok::arrow);
+    }
     return Diag(MemberLoc, diag::err_typecheck_member_reference_ivar)
              << IFTy->getDecl()->getDeclName() << &Member
              << BaseExpr->getSourceRange();