1 files changed, 9 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp
index 525f0fe1d62..490936f625d 100644
--- a/clang/lib/CodeGen/Mangle.cpp
+++ b/clang/lib/CodeGen/Mangle.cpp
@@ -18,6 +18,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
+#include "clang/AST/DeclObjC.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/raw_ostream.h"
@@ -49,6 +50,7 @@ namespace {
     void mangleType(const ArrayType *T);
     void mangleType(const MemberPointerType *T);
     void mangleType(const TemplateTypeParmType *T);
+    void mangleType(const ObjCInterfaceType *T);
     void mangleExpression(Expr *E);
   };
 }
@@ -377,6 +379,9 @@ void CXXNameMangler::mangleType(QualType T) {
     // GNU extension: vector types
     Out << "U8__vector";
     mangleType(VT->getElementType());
+  } else if (const ObjCInterfaceType *IT = 
+             dyn_cast<ObjCInterfaceType>(T.getTypePtr())) {
+    mangleType(IT);
   }
   // FIXME:  ::= G <type>   # imaginary (C 2000)
   // FIXME:  ::= U <source-name> <type>     # vendor extended type qualifier
@@ -504,6 +509,10 @@ void CXXNameMangler::mangleType(const TemplateTypeParmType *T) {
     Out << 'T' << (T->getIndex() - 1) << '_';
 }
 
+void CXXNameMangler::mangleType(const ObjCInterfaceType *T) {
+  mangleSourceName(T->getDecl()->getIdentifier());
+}
+
 void CXXNameMangler::mangleExpression(Expr *E) {
   assert(false && "Cannot mangle expressions yet");
 }