From af2f62ce32e462f256855cd24b06dec4755d2827 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 13 Aug 2008 00:59:25 +0000 Subject: Change ObjCRuntime GenerateProtocol[Ref] methods to take ObjCProtocolDecl directly. Implement CodeGen support for forward protocol decls (no-ops are so nice to implement). Also moved CGObjCRuntime.h out of CodeGenModule.h git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54709 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'lib/CodeGen/CodeGenModule.cpp') diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 633b7b8dad..f575300b6d 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -14,6 +14,7 @@ #include "CGDebugInfo.h" #include "CodeGenModule.h" #include "CodeGenFunction.h" +#include "CGObjCRuntime.h" #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" #include "clang/Basic/Diagnostic.h" @@ -247,33 +248,7 @@ void CodeGenModule::EmitObjCMethod(const ObjCMethodDecl *OMD) { CodeGenFunction(*this).GenerateObjCMethod(OMD); } void CodeGenModule::EmitObjCProtocolImplementation(const ObjCProtocolDecl *PD){ - llvm::SmallVector Protocols; - for (ObjCProtocolDecl::protocol_iterator PI = PD->protocol_begin(), - E = PD->protocol_end(); PI != E; ++PI) - Protocols.push_back((*PI)->getName()); - llvm::SmallVector InstanceMethodNames; - llvm::SmallVector InstanceMethodTypes; - for (ObjCProtocolDecl::instmeth_iterator iter = PD->instmeth_begin(), - E = PD->instmeth_end(); iter != E; iter++) { - std::string TypeStr; - Context.getObjCEncodingForMethodDecl(*iter, TypeStr); - InstanceMethodNames.push_back( - GetAddrOfConstantString((*iter)->getSelector().getName())); - InstanceMethodTypes.push_back(GetAddrOfConstantString(TypeStr)); - } - // Collect information about class methods: - llvm::SmallVector ClassMethodNames; - llvm::SmallVector ClassMethodTypes; - for (ObjCProtocolDecl::classmeth_iterator iter = PD->classmeth_begin(), - endIter = PD->classmeth_end() ; iter != endIter ; iter++) { - std::string TypeStr; - Context.getObjCEncodingForMethodDecl((*iter),TypeStr); - ClassMethodNames.push_back( - GetAddrOfConstantString((*iter)->getSelector().getName())); - ClassMethodTypes.push_back(GetAddrOfConstantString(TypeStr)); - } - Runtime->GenerateProtocol(PD->getName(), Protocols, InstanceMethodNames, - InstanceMethodTypes, ClassMethodNames, ClassMethodTypes); + Runtime->GenerateProtocol(PD); } void CodeGenModule::EmitObjCCategoryImpl(const ObjCCategoryImplDecl *OCD) { -- cgit v1.2.3-18-g5258