From c47dc4f5afacc12c6fb309e41e3e4ff5034bbdf0 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Thu, 13 Dec 2007 20:47:42 +0000
Subject: Patch to make ObjcQualifiedInterfaceType inherit ObjcInterfaceType

llvm-svn: 45014
---
 clang/AST/Type.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'clang/AST/Type.cpp')

diff --git a/clang/AST/Type.cpp b/clang/AST/Type.cpp
index 4befdcb5425..b1da04b0a31 100644
--- a/clang/AST/Type.cpp
+++ b/clang/AST/Type.cpp
@@ -529,16 +529,14 @@ void FunctionTypeProto::Profile(llvm::FoldingSetNodeID &ID) {
 }
 
 void ObjcQualifiedInterfaceType::Profile(llvm::FoldingSetNodeID &ID,
-                                         ObjcInterfaceType *interfaceType, 
                                          ObjcProtocolDecl **protocols, 
                                          unsigned NumProtocols) {
-  ID.AddPointer(interfaceType);
   for (unsigned i = 0; i != NumProtocols; i++)
     ID.AddPointer(protocols[i]);
 }
 
 void ObjcQualifiedInterfaceType::Profile(llvm::FoldingSetNodeID &ID) {
-  Profile(ID, getInterfaceType(), &Protocols[0], getNumProtocols());
+  Profile(ID, &Protocols[0], getNumProtocols());
 }
 
 /// LookThroughTypedefs - Return the ultimate type this typedef corresponds to
@@ -770,7 +768,7 @@ void ObjcQualifiedInterfaceType::getAsStringInternal(
                                   std::string &InnerString) const {
   if (!InnerString.empty())    // Prefix the basic type, e.g. 'typedefname X'.
     InnerString = ' ' + InnerString;
-  std::string ObjcQIString = getInterfaceType()->getDecl()->getName();
+  std::string ObjcQIString = getDecl()->getName();
   ObjcQIString += '<';
   int num = getNumProtocols();
   for (int i = 0; i < num; i++) {
-- 
cgit v1.2.3