[demangler] Simplify printing of structured bindings.

Thanks to Richard Smith for the post-commit review!

llvm-svn: 327228

2 files changed, 4 insertions, 4 deletions

diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp
index bc6bbc10b01..cbf04987afb 100644
--- a/libcxxabi/src/cxa_demangle.cpp
+++ b/libcxxabi/src/cxa_demangle.cpp
@@ -1345,7 +1345,7 @@ public:
       : Node(KStructuredBindingName), Bindings(Bindings_) {}
 
   void printLeft(OutputStream &S) const override {
-    S += "'structured-binding'[";
+    S += '[';
     Bindings.printWithComma(S);
     S += ']';
   }
diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp
index 2b84c9d5966..b15555965d8 100644
--- a/libcxxabi/test/test_demangle.pass.cpp
+++ b/libcxxabi/test/test_demangle.pass.cpp
@@ -29720,10 +29720,10 @@ const char* cases[][2] =
     {"___Z10blocksNRVOv_block_invoke", "invocation function for block in blocksNRVO()"},
 
     // Structured bindings:
-    {"_ZDC2a12a2E", "'structured-binding'[a1, a2]"},
-    {"_ZN2NSDC1x1yEE", "NS::'structured-binding'[x, y]"},
+    {"_ZDC2a12a2E", "[a1, a2]"},
+    {"_ZN2NSDC1x1yEE", "NS::[x, y]"},
 
-    {"_ZGRDC1x1yE_", "reference temporary for 'structured-binding'[x, y]"},
+    {"_ZGRDC1x1yE_", "reference temporary for [x, y]"},
     {"_ZGR1bIvE2_", "reference temporary for b<void>"},
 };