[llvm-branch-commits] [cfe-branch] r71910 - /cfe/branches/Apple/Dib/lib/CodeGen/CGObjCMac.cpp

[Mike Stump]

Author: mrs
Date: Fri May 15 18:31:46 2009
New Revision: 71910

URL: http://llvm.org/viewvc/llvm-project?rev=71910&view=rev
Log:
Resolve some conflicts by hand.

Modified:
    cfe/branches/Apple/Dib/lib/CodeGen/CGObjCMac.cpp

Modified: cfe/branches/Apple/Dib/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/CodeGen/CGObjCMac.cpp?rev=71910&r1=71909&r2=71910&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/branches/Apple/Dib/lib/CodeGen/CGObjCMac.cpp Fri May 15 18:31:46 2009
@@ -4195,16 +4195,17 @@
   return GV;
 }
 
-bool 
+bool
 CGObjCNonFragileABIMac::ImplementationIsNonLazy(const DeclContext *DC) const {
-  DeclContext::lookup_const_result res = 
-    DC->lookup(CGM.getContext(), GetNullarySelector("load"));
+  IdentifierInfo *II = &CGM.getContext().Idents.get("load");
+  DeclContext::lookup_const_result res =
+    DC->lookup(CGM.getContext(), CGM.getContext().Selectors.getSelector(0, &II));
 
   for (; res.first != res.second; ++res.first)
     if (const ObjCMethodDecl *OMD = dyn_cast<ObjCMethodDecl>(*res.first))
       if (OMD->isClassMethod())
         return true;
-  
+
   return false;
 }