I made a series of changes to LLVM's demangle in:
and so did Fangrui in 3ece37b3fa2c and Ashay in D149061.
I didn't notice the banner about there being two copies of this in tree
and was modifying the downstream versions. Copy these changes back to
the upstream version. Oops!