Add demangling support for C++11 thread_local variables

[davidb]

Summary

Add support for demangling C++11 thread_local variables. In clang, the grammar for mangling for these names are "<special-name> ::= TW <object name>" for wrapper variables or "<special-name> ::= TH <object name>" for initialization variables.

[davidb]

ping

[davidb]

ping

[mehdi_amini]

LGTM.

Can you apply the patch in LLVM (libDemangle) as well please?

[davidb]

In D27985#660029, @mehdi_amini wrote:

LGTM.

Can you apply the patch in LLVM (libDemangle) as well please?

Thank you Mehdi. I have an LLVM (libDemangle) with an identical change (minus the tests) waiting. Would you like my to submit it as a separate patch?

I've just requested commit access so fingers crossed I can apply them both soon.

[mehdi_amini]

In D27985#660354, @davidb wrote:

In D27985#660029, @mehdi_amini wrote:

LGTM.

Can you apply the patch in LLVM (libDemangle) as well please?

Thank you Mehdi. I have an LLVM (libDemangle) with an identical change (minus the tests) waiting. Would you like my to submit it as a separate patch?

No, just commit it.

[davidb]

Closed by revision r293638.

src/cxa_demangle.cpp

 //                ::= Tc <call-offset> <call-offset> <base encoding>
 //                    # base is the nominal target function of thunk
 //                    # first call-offset is 'this' adjustment
 //                    # second call-offset is result adjustment
 //                ::= T <call-offset> <base encoding>
 //                    # base is the nominal target function of thunk
 //                ::= GV <object name> # Guard variable for one-time initialization
 //                                     # No <type>
+//                ::= TW <object name> # Thread-local wrapper
+//                ::= TH <object name> # Thread-local initialization
 //      extension ::= TC <first type> <number> _ <second type> # construction vtable for second-in-first
 //      extension ::= GR <object name> # reference temporary for object
 
 template <class C>
 const char*
 parse_special_name(const char* first, const char* last, C& db)
 {
     if (last - first > 2)
if (last - first > 2)
                             db.names.back().first = "construction vtable for " +
                                                     std::move(left) + "-in-" +
                                                     db.names.back().move_full();
                             first = t1;
                         }
                     }
                 }
                 break;
+            case 'W':
+                // TW <object name> # Thread-local wrapper
+                t = parse_name(first + 2, last, db);
+                if (t != first + 2) 
+                {
+                    if (db.names.empty())
+                    return first;
+                    db.names.back().first.insert(0, "thread-local wrapper routine for ");
+                    first = t;
+                }
+                break;
+            case 'H':
+                //TH <object name> # Thread-local initialization
+                t = parse_name(first + 2, last, db);
+                if (t != first + 2) 
+                {
+                    if (db.names.empty())
+                    return first;
+                    db.names.back().first.insert(0, "thread-local initialization routine for ");
+                    first = t;
+                }
+                break;
             default:
                 // T <call-offset> <base encoding>
                 {
                 const char* t0 = parse_call_offset(first+1, last);
                 if (t0 == first+1)
                     break;
                 t = parse_encoding(t0, last, db);
                 if (t != t0)

test/test_demangle.pass.cpp

//    {"_Z1fM1XRFivEMS_OFivEMS_KOFivE", "f(int (X::*)() &, int (X::*)() &&, int (X::*)() const &&)"},
     {"_Z1fIiEDcT_", "decltype(auto) f<int>(int)"},
     {"_ZZ4testvEN1g3fooE5Point", "test()::g::foo(Point)"},
     {"_ZThn12_NSt9strstreamD0Ev",   "non-virtual thunk to std::strstream::~strstream()"},
     {"_ZTv0_n12_NSt9strstreamD0Ev",     "virtual thunk to std::strstream::~strstream()"},
 
     // NOTE: disable this test since it is a negative test case, you cannot demangle a non-mangled symbol
     // {"\x6D", nullptr},  // This use to crash with ASAN
     {"_ZTIU4_farrVKPi", "typeinfo for int* const volatile restrict _far"},
+    {"_ZTW1x", "thread-local wrapper routine for x"},
+    {"_ZTHN3fooE", "thread-local initialization routine for foo"},
 };
 
 const unsigned N = sizeof(cases) / sizeof(cases[0]);
 
 struct FPLiteralCase {
     const char *mangled;
     // There are four possible demanglings of a given float.
     std::string expecting[4];