clang-cl: Fix mangling of catchable types with names longer than 4kiB
The mangling used to contain the MD5 name of both the RTTI type
descriptor and the name of the copy ctor in MSVC2013, but it changed
to just the former in 2015. It looks like it changed back to the old
mangling in VS2017 version 15.7 and onwards, including VS2019 (version
16.0). VS2017 version 15.0 still has the VS2015 mangling. Versions
between 15.0 and 15.7 are't on godbolt. I found 15.4 (_MSC_VER 1911)
locally and that uses the 15.0 mangling still, but I didn't find 15.5 or
15.6, so I'm not sure where exactly it changed back.
Differential Revision: https://reviews.llvm.org/D62490
llvm-svn: 361959
diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp
index db18121..a021e71 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -3151,12 +3151,18 @@
}
Mangler.getStream() << RTTIMangling;
- // VS2015 CTP6 omits the copy-constructor in the mangled name. This name is,
- // in fact, superfluous but I'm not sure the change was made consciously.
+ // VS2015 and VS2017.1 omit the copy-constructor in the mangled name but
+ // both older and newer versions include it.
+ // FIXME: It is known that the Ctor is present in 2013, and in 2017.7
+ // (_MSC_VER 1914) and newer, and that it's omitted in 2015 and 2017.4
+ // (_MSC_VER 1911), but it's unknown when exactly it reappeared (1914?
+ // Or 1912, 1913 aleady?).
+ bool OmitCopyCtor = getASTContext().getLangOpts().isCompatibleWithMSVC(
+ LangOptions::MSVC2015) &&
+ !getASTContext().getLangOpts().isCompatibleWithMSVC(
+ LangOptions::MSVC2017_7);
llvm::SmallString<64> CopyCtorMangling;
- if (!getASTContext().getLangOpts().isCompatibleWithMSVC(
- LangOptions::MSVC2015) &&
- CD) {
+ if (!OmitCopyCtor && CD) {
llvm::raw_svector_ostream Stream(CopyCtorMangling);
msvc_hashing_ostream MHO(Stream);
mangleCXXCtor(CD, CT, MHO);