[cfe-commits] r63343 - /cfe/trunk/lib/CodeGen/CGObjCMac.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Jan 29 17:23:06 2009
New Revision: 63343

URL: http://llvm.org/viewvc/llvm-project?rev=63343&view=rev
Log:
Random bug fix related to protocl metadata in categories in
non-fragile abi.

Modified:
    cfe/trunk/lib/CodeGen/CGObjCMac.cpp

Modified: cfe/trunk/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCMac.cpp?rev=63343&r1=63342&r2=63343&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCMac.cpp Thu Jan 29 17:23:06 2009
@@ -3519,13 +3519,14 @@
   Values[3] = EmitMethodList(MethodListName, 
                              "__DATA, __objc_const", 
                              Methods);
-  Values[4] = EmitProtocolList("\01l_OBJC_CATEGORY_PROTOCOLS_$_" 
-                               + Interface->getNameAsString(),
-                                Interface->protocol_begin(),
-                                Interface->protocol_end());
-  
   const ObjCCategoryDecl *Category = 
     Interface->FindCategoryDeclaration(OCD->getIdentifier());
+  Values[4] = EmitProtocolList("\01l_OBJC_CATEGORY_PROTOCOLS_$_"
+                               + Interface->getNameAsString() + "_$_"
+                               + Category->getNameAsString(),
+                                Category->protocol_begin(),
+                                Category->protocol_end());
+  
   std::string ExtName(Interface->getNameAsString() + "_$_" +
                       OCD->getNameAsString());
   Values[5] =