[libcxxabi] r184301 - Demangle objc mangling implemented in r184250

[Howard Hinnant]

Author: hhinnant
Date: Wed Jun 19 08:43:18 2013
New Revision: 184301

URL: http://llvm.org/viewvc/llvm-project?rev=184301&view=rev
Log:
Demangle objc mangling implemented in r184250

Modified:
    libcxxabi/trunk/src/cxa_demangle.cpp
    libcxxabi/trunk/test/test_demangle.cpp

Modified: libcxxabi/trunk/src/cxa_demangle.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_demangle.cpp?rev=184301&r1=184300&r2=184301&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_demangle.cpp (original)
+++ libcxxabi/trunk/src/cxa_demangle.cpp Wed Jun 19 08:43:18 2013
@@ -1759,8 +1759,12 @@ parse_vector_type(const char* first, con
 //        ::= G <type>        # imaginary (C 2000)
 //        ::= Dp <type>       # pack expansion (C++0x)
 //        ::= U <source-name> <type>  # vendor extended type qualifier
+// extension := U <objc-name> <objc-type>  # objc-type<identifier>
 // extension := <vector-type> # <vector-type> starts with Dv
 
+// <objc-name> ::= <k0 number> objcproto <k1 number> <identifier>  # k0 = 9 + <number of digits in k1> + k1
+// <objc-type> := <source-name>  # PU<11+>objcproto 11objc_object<source-name> 11objc_object -> id<source-name>
+
 template <class C>
 const char*
 parse_type(const char* first, const char* last, C& db)
@@ -1924,7 +1928,14 @@ parse_type(const char* first, const char
                                     db.names[k].first += "(";
                                     db.names[k].second.insert(0, ")");
                                 }
-                                db.names[k].first.append("*");
+                                if (first[1] != 'U' || db.names[k].first.substr(0, 12) != "objc_object<")
+                                {
+                                    db.names[k].first.append("*");
+                                }
+                                else
+                                {
+                                    db.names[k].first.replace(0, 11, "id");
+                                }
                                 db.subs.back().push_back(db.names[k]);
                             }
                             first = t;
@@ -1993,9 +2004,26 @@ parse_type(const char* first, const char
                                 const char* t2 = parse_type(t, last, db);
                                 if (t2 != t)
                                 {
-                                    auto type = std::move(db.names.back().move_full());
+                                    auto type = db.names.back().move_full();
                                     db.names.pop_back();
-                                    db.names.back() = type + " " + db.names.back().move_full();
+                                    if (db.names.back().first.substr(0, 9) != "objcproto")
+                                    {
+                                        db.names.back() = type + " " + db.names.back().move_full();
+                                    }
+                                    else
+                                    {
+                                        auto proto = db.names.back().move_full();
+                                        db.names.pop_back();
+                                        t = parse_source_name(proto.data() + 9, proto.data() + proto.size(), db);
+                                        if (t != proto.data() + 9)
+                                        {
+                                            db.names.back() = type + "<" + db.names.back().move_full() + ">";
+                                        }
+                                        else
+                                        {
+                                            db.names.push_back(type + " " + proto);
+                                        }
+                                    }
                                     db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
                                     first = t2;
                                 }
@@ -4412,6 +4440,7 @@ __cxa_demangle(const char* mangled_name,
     };
     Db db(a);
     db.cv = 0;
+    db.ref = 0;
     db.parsed_ctor_dtor_cv = false;
     db.tag_templates = true;
     db.template_param.emplace_back(a);

Modified: libcxxabi/trunk/test/test_demangle.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/test_demangle.cpp?rev=184301&r1=184300&r2=184301&view=diff
==============================================================================
--- libcxxabi/trunk/test/test_demangle.cpp (original)
+++ libcxxabi/trunk/test/test_demangle.cpp Wed Jun 19 08:43:18 2013
@@ -29582,6 +29582,8 @@ const char* cases[][2] =
     {"_ZZN1S1fEiiEd0_NKUlvE_clEv", "S::f(int, int)::'lambda'()::operator()() const"},
     {"_Z3fooPM2ABi", "foo(int AB::**)"},
     {"_Z1rM1GFivEMS_KFivES_M1HFivES1_4whatIKS_E5what2IS8_ES3_", "r(int (G::*)(), int (G::*)() const, G, int (H::*)(), int (G::*)(), what<G const>, what2<G const>, int (G::*)() const)"},
+    {"_Z1fPU11objcproto1A11objc_object", "f(id<A>)"},
+    {"_Z1fPKU11objcproto1A7NSArray", "f(NSArray<A> const*)"},
 };
 
 const unsigned N = sizeof(cases) / sizeof(cases[0]);