commit cf9f3ea6f969e0ac8fcc7af06d0ae7e511363411
author Douglas Gregor <dgregor@apple.com> Mon Jan 02 02:00:30 2012 +0000
committer Douglas Gregor <dgregor@apple.com> Mon Jan 02 02:00:30 2012 +0000
tree 2cee59c17b8c23b37eff1f8498eabe6b3ea6e9fb
parent 1bd96176717fc2e5edcc5e41a7a167c9401abd00

Fix canonicalization of protocol-qualified types

llvm-svn: 147421

clang/lib/Rewrite/RewriteObjC.cpp

diff --git a/clang/lib/Rewrite/RewriteObjC.cpp b/clang/lib/Rewrite/RewriteObjC.cpp
index 19277e8..5cf1b11 100644
--- a/clang/lib/Rewrite/RewriteObjC.cpp
+++ b/clang/lib/Rewrite/RewriteObjC.cpp
@@ -990,7 +990,8 @@
 
 void RewriteObjC::RewriteProtocolDecl(ObjCProtocolDecl *PDecl) {
   SourceLocation LocStart = PDecl->getLocStart();
-
+  assert(PDecl->isThisDeclarationADefinition());
+  
   // FIXME: handle protocol headers that are declared across multiple lines.
   ReplaceText(LocStart, 0, "// ");
 
@@ -5223,6 +5224,9 @@
   if (ObjCSynthesizedProtocols.count(PDecl->getCanonicalDecl()))
     return;
   
+  if (ObjCProtocolDecl *Def = PDecl->getDefinition())
+    PDecl = Def;
+  
   if (PDecl->instmeth_begin() != PDecl->instmeth_end()) {
     unsigned NumMethods = std::distance(PDecl->instmeth_begin(),
                                         PDecl->instmeth_end());