From 3bbae00f501231e0eea9d7be6086aace69c27f1b Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Sat, 26 Jul 2008 04:03:38 +0000
Subject: pull protocol resolution out into ActOnStartProtocolInterface. This
 temporarily duplicates ParseObjCProtocolReferences, but it will be removed in
 the future.

llvm-svn: 54092
---
 clang/lib/Parse/ParseDecl.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'clang/lib/Parse/ParseDecl.cpp')

diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index e047d601ef0..f66bb99962e 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -431,13 +431,8 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS) {
         continue;
       
       SourceLocation EndProtoLoc;
-      llvm::SmallVector<IdentifierLocPair, 8> ProtocolRefs;
-      ParseObjCProtocolReferences(ProtocolRefs, EndProtoLoc);
-      
       llvm::SmallVector<DeclTy *, 8> ProtocolDecl;
-      Actions.FindProtocolDeclaration(Loc, false,
-                                      &ProtocolRefs[0], ProtocolRefs.size(),
-                                      ProtocolDecl);
+      ParseObjCProtocolReferences(ProtocolDecl, false, EndProtoLoc);
       DS.setProtocolQualifiers(&ProtocolDecl[0], ProtocolDecl.size());
       
       DS.SetRangeEnd(EndProtoLoc);
@@ -572,12 +567,8 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS) {
         
       {
         SourceLocation EndProtoLoc;
-        llvm::SmallVector<IdentifierLocPair, 8> ProtocolRefs;
-        ParseObjCProtocolReferences(ProtocolRefs, EndProtoLoc);
         llvm::SmallVector<DeclTy *, 8> ProtocolDecl;
-        Actions.FindProtocolDeclaration(Loc, false,
-                                        &ProtocolRefs[0], ProtocolRefs.size(),
-                                        ProtocolDecl);
+        ParseObjCProtocolReferences(ProtocolDecl, false, EndProtoLoc);
         DS.setProtocolQualifiers(&ProtocolDecl[0], ProtocolDecl.size());
         DS.SetRangeEnd(EndProtoLoc);
 
-- 
cgit v1.2.3