Fix demangle helper after r286788

llvm-svn: 292541

2 files changed, 2 insertions, 4 deletions

diff --git a/libcxx/test/support/demangle.h b/libcxx/test/support/demangle.h
index 41761fd420e..98d93c85ad7 100644
--- a/libcxx/test/support/demangle.h
+++ b/libcxx/test/support/demangle.h
@@ -34,9 +34,7 @@ inline std::string demangle(const char* mangled_name) {
 template <size_t N> struct Printer;
 inline std::string demangle(const char* mangled_name) {
   int status = 0;
-  std::string input(mangled_name);
-  input.insert(0, "_Z");
-  char* out = __cxxabiv1::__cxa_demangle(input.c_str(), nullptr, nullptr, &status);
+  char* out = __cxxabiv1::__cxa_demangle(mangled_name, nullptr, nullptr, &status);
   if (out != nullptr) {
     std::string res(out);
     std::free(out);
diff --git a/libcxx/test/support/test.support/test_demangle.pass.cpp b/libcxx/test/support/test.support/test_demangle.pass.cpp
index c924246e8c0..08808c1942c 100644
--- a/libcxx/test/support/test.support/test_demangle.pass.cpp
+++ b/libcxx/test/support/test.support/test_demangle.pass.cpp
@@ -20,7 +20,7 @@ int main() {
     const char* raw;
     const char* expect;
   } TestCases[] = {
-      {typeid(int).name(), "i"}, // FIXME
+      {typeid(int).name(), "int"},
       {typeid(MyType).name(), "MyType"},
       {typeid(ArgumentListID<int, MyType>).name(), "ArgumentListID<int, MyType>"}
   };