2 files changed, 18 insertions, 17 deletions

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index d9bec6d31a..1e05eb6141 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -375,21 +375,6 @@ ObjCInterfaceDecl::FindCategoryDeclaration(IdentifierInfo *CategoryId) const {
   return 0;
 }
 
-/// lookupFieldDeclForIvar - looks up a field decl in the laid out
-/// storage which matches this 'ivar'.
-///
-const FieldDecl *
-ObjCInterfaceDecl::lookupFieldDeclForIvar(ASTContext &Context, 
-                                          const ObjCIvarDecl *IVar) const {
-  assert(!isForwardDecl() && "Invalid interface decl!");
-  const RecordDecl *RecordForDecl = Context.addRecordToClass(this);
-  assert(RecordForDecl && "lookupFieldDeclForIvar no storage for class");
-  DeclContext::lookup_const_result Lookup =
-    RecordForDecl->lookup(Context, IVar->getDeclName());
-  assert((Lookup.first != Lookup.second) && "field decl not found");
-  return cast<FieldDecl>(*Lookup.first);
-}
-
 //===----------------------------------------------------------------------===//
 // ObjCIvarDecl
 //===----------------------------------------------------------------------===//
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index a80274a690..a993963680 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -41,6 +41,22 @@ CGObjCRuntime::GetConcreteClassStruct(CodeGen::CodeGenModule &CGM,
   return cast<llvm::StructType>(CGM.getTypes().ConvertTagDeclType(RD));
 }
 
+
+/// LookupFieldDeclForIvar - looks up a field decl in the laid out
+/// storage which matches this 'ivar'.
+///
+static const FieldDecl *LookupFieldDeclForIvar(ASTContext &Context, 
+                                               const ObjCInterfaceDecl *OID,
+                                               const ObjCIvarDecl *OIVD) {
+  assert(!OID->isForwardDecl() && "Invalid interface decl!");
+  const RecordDecl *RecordForDecl = Context.addRecordToClass(OID);
+  assert(RecordForDecl && "lookupFieldDeclForIvar no storage for class");
+  DeclContext::lookup_const_result Lookup =
+    RecordForDecl->lookup(Context, OIVD->getDeclName());
+  assert((Lookup.first != Lookup.second) && "field decl not found");
+  return cast<FieldDecl>(*Lookup.first);
+}
+
 uint64_t CGObjCRuntime::ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
                                               const ObjCInterfaceDecl *OID,
                                               const ObjCIvarDecl *Ivar) {
@@ -50,7 +66,7 @@ uint64_t CGObjCRuntime::ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
   const llvm::StructLayout *Layout = 
     CGM.getTargetData().getStructLayout(STy);
   const FieldDecl *Field = 
-    OID->lookupFieldDeclForIvar(CGM.getContext(), Ivar);
+    LookupFieldDeclForIvar(CGM.getContext(), OID, Ivar);
   if (!Field->isBitField())
     return Layout->getElementOffset(CGM.getTypes().getLLVMFieldNo(Field));
   
@@ -82,7 +98,7 @@ LValue CGObjCRuntime::EmitValueForIvarAtOffset(CodeGen::CodeGenFunction &CGF,
   // since the structure layout is fixed; however for that we need to
   // be able to walk the class chain for an Ivar.
   const FieldDecl *Field = 
-    OID->lookupFieldDeclForIvar(CGF.CGM.getContext(), Ivar);
+    LookupFieldDeclForIvar(CGF.CGM.getContext(), OID, Ivar);
   
   // (char *) BaseValue
   llvm::Type *I8Ptr = llvm::PointerType::getUnqual(llvm::Type::Int8Ty);