[cfe-commits] r66349 - in /cfe/trunk: lib/CodeGen/Mangle.cpp test/CodeGenObjC/overloadable.m

[Anders Carlsson]

Author: andersca
Date: Sat Mar  7 16:03:21 2009
New Revision: 66349

URL: http://llvm.org/viewvc/llvm-project?rev=66349&view=rev
Log:
Mangle Objective-C interfaces correctly (where correctly refers to what gcc does)

Added:
    cfe/trunk/test/CodeGenObjC/overloadable.m
Modified:
    cfe/trunk/lib/CodeGen/Mangle.cpp

Modified: cfe/trunk/lib/CodeGen/Mangle.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/Mangle.cpp?rev=66349&r1=66348&r2=66349&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/Mangle.cpp (original)
+++ cfe/trunk/lib/CodeGen/Mangle.cpp Sat Mar  7 16:03:21 2009
@@ -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 @@
     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 @@
     // 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 @@
     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");
 }

Added: cfe/trunk/test/CodeGenObjC/overloadable.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/overloadable.m?rev=66349&view=auto

==============================================================================
--- cfe/trunk/test/CodeGenObjC/overloadable.m (added)
+++ cfe/trunk/test/CodeGenObjC/overloadable.m Sat Mar  7 16:03:21 2009
@@ -0,0 +1,9 @@
+// RUN: clang -emit-llvm %s -o %t && 
+
+ at class C;
+
+// RUN: grep _Z1fP11objc_object %t | count 1 && 
+void __attribute__((overloadable)) f(C *c) { }
+
+// RUN: grep _Z1fP1C | count 1
+void __attribute__((overloadable)) f(id c) { }