Revert r286788
The Itanium ABI [1] specifies that __cxa_demangle accept either:
1) symbol names, which start with "_Z"
2) type manglings, which do not start with "_Z"
r286788 erroneously assumes that it should only handle symbols, so this patch
reverts it and adds a counterexample to the testcase.
1: https://mentorembedded.github.io/cxx-abi/abi.html#demangler
Reviewers: zygoloid, EricWF
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@292418 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp
index ed43cb2..402ee0c 100644
--- a/src/cxa_demangle.cpp
+++ b/src/cxa_demangle.cpp
@@ -4979,22 +4979,12 @@
return nullptr;
}
- size_t len = std::strlen(mangled_name);
- if (len < 2 || strncmp(mangled_name, "_Z", 2))
- {
- if (len < 4 || strncmp(mangled_name, "___Z", 4))
- {
- if (status)
- *status = invalid_mangled_name;
- return nullptr;
- }
- }
-
size_t internal_size = buf != nullptr ? *n : 0;
arena<bs> a;
Db db(a);
db.template_param.emplace_back(a);
int internal_status = success;
+ size_t len = std::strlen(mangled_name);
demangle(mangled_name, mangled_name + len, db,
internal_status);
if (internal_status == success && db.fix_forward_references &&
diff --git a/test/test_demangle.pass.cpp b/test/test_demangle.pass.cpp
index af16b56..effe5c0 100644
--- a/test/test_demangle.pass.cpp
+++ b/test/test_demangle.pass.cpp
@@ -29594,6 +29594,9 @@
// 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"},
+
+ // mangled names can include type manglings too, which don't start with _Z:
+ {"i", "int"},
};
const unsigned N = sizeof(cases) / sizeof(cases[0]);
