From 8ebfb60efa77062d12a3ecc804b8b52737b7ac1c Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 12 Oct 2015 20:45:05 +0000 Subject: [PATCH] Fix Bug 25103 - _cxa_demangle improperly demangles virtual thunks. Thanks to Jason King for the report and suggested fix llvm-svn: 250097 --- libcxxabi/src/cxa_demangle.cpp | 2 +- libcxxabi/test/test_demangle.pass.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp index e6bf1675a2f9..f1ad815ac4a5 100644 --- a/libcxxabi/src/cxa_demangle.cpp +++ b/libcxxabi/src/cxa_demangle.cpp @@ -4415,7 +4415,7 @@ parse_special_name(const char* first, const char* last, C& db) { if (db.names.empty()) return first; - if (first[2] == 'v') + if (first[1] == 'v') { db.names.back().first.insert(0, "virtual thunk to "); first = t; diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp index 7e845b10bfef..dd6f81e0e3f3 100644 --- a/libcxxabi/test/test_demangle.pass.cpp +++ b/libcxxabi/test/test_demangle.pass.cpp @@ -29594,6 +29594,8 @@ const char* cases[][2] = {"_Zli2_xy", "operator\"\" _x(unsigned long long)"}, {"_Z1fIiEDcT_", "decltype(auto) f(int)"}, {"_ZZ4testvEN1g3fooE5Point", "test()::g::foo(Point)"}, + {"_ZThn12_NSt9strstreamD0Ev", "non-virtual thunk to std::strstream::~strstream()"}, + {"_ZTv0_n12_NSt9strstreamD0Ev", "virtual thunk to std::strstream::~strstream()"}, }; const unsigned N = sizeof(cases) / sizeof(cases[0]);