maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

MS ABI: Simplify microsoft mangling of template instantiations 

Use mangled template instantiation name as key for back references.
Templates have their own context for back references, so their mangling
is always the same regardless of context. This avoids mangling template
instantiations twice.

Patch by Agustín Bergé!

llvm-svn: 210416
This commit is contained in:
David Majnemer 2014-06-08 04:51:13 +00:00
parent 70a0206e4b
commit c986fcc9aa
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clang/lib/AST/MicrosoftMangle.cpp
View File

@ -193,7 +193,6 @@ class MicrosoftCXXNameMangler {
typedef llvm::StringMap<unsigned> BackRefMap;
BackRefMap NameBackReferences;
bool UseNameBackReferences;
typedef llvm::DenseMap<void *, unsigned> ArgBackRefMap;
ArgBackRefMap TypeBackReferences;
@ -209,14 +208,12 @@ public:
MicrosoftCXXNameMangler(MicrosoftMangleContextImpl &C, raw_ostream &Out_)
: Context(C), Out(Out_), Structor(nullptr), StructorType(-1),
UseNameBackReferences(true),
PointersAre64Bit(C.getASTContext().getTargetInfo().getPointerWidth(0) ==
64) {}
MicrosoftCXXNameMangler(MicrosoftMangleContextImpl &C, raw_ostream &Out_,
const CXXDestructorDecl *D, CXXDtorType Type)
: Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type),
UseNameBackReferences(true),
PointersAre64Bit(C.getASTContext().getTargetInfo().getPointerWidth(0) ==
64) {}
@ -241,7 +238,6 @@ public:
void mangleNestedName(const NamedDecl *ND);
private:
void disableBackReferences() { UseNameBackReferences = false; }
void mangleUnqualifiedName(const NamedDecl *ND) {
mangleUnqualifiedName(ND, ND->getDeclName());
}
@ -667,26 +663,22 @@ void MicrosoftCXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND,
// type [ -> template-parameters]
// \-> namespace[s]
// What we do is we create a new mangler, mangle the same type (without
// a namespace suffix) using the extra mangler with back references
// disabled (to avoid infinite recursion) and then use the mangled type
// name as a key to check the mangling of different types for aliasing.
// a namespace suffix) to a string using the extra mangler and then use
// the mangled type name as a key to check the mangling of different types
// for aliasing.
std::string BackReferenceKey;
BackRefMap::iterator Found;
if (UseNameBackReferences) {
llvm::raw_string_ostream Stream(BackReferenceKey);
MicrosoftCXXNameMangler Extra(Context, Stream);
Extra.disableBackReferences();
Extra.mangleUnqualifiedName(ND, Name);
Stream.flush();
std::string TemplateMangling;
llvm::raw_string_ostream Stream(TemplateMangling);
MicrosoftCXXNameMangler Extra(Context, Stream);
Extra.mangleTemplateInstantiationName(TD, *TemplateArgs);
Stream.flush();
Found = NameBackReferences.find(BackReferenceKey);
}
if (!UseNameBackReferences || Found == NameBackReferences.end()) {
mangleTemplateInstantiationName(TD, *TemplateArgs);
if (UseNameBackReferences && NameBackReferences.size() < 10) {
BackRefMap::iterator Found = NameBackReferences.find(TemplateMangling);
if (Found == NameBackReferences.end()) {
Out << TemplateMangling;
if (NameBackReferences.size() < 10) {
size_t Size = NameBackReferences.size();
NameBackReferences[BackReferenceKey] = Size;
NameBackReferences[TemplateMangling] = Size;
}
} else {
Out << Found->second;
@ -1009,12 +1001,10 @@ void MicrosoftCXXNameMangler::mangleOperatorName(OverloadedOperatorKind OO,
void MicrosoftCXXNameMangler::mangleSourceName(StringRef Name) {
// <source name> ::= <identifier> @
BackRefMap::iterator Found;
if (UseNameBackReferences)
Found = NameBackReferences.find(Name);
if (!UseNameBackReferences || Found == NameBackReferences.end()) {
BackRefMap::iterator Found = NameBackReferences.find(Name);
if (Found == NameBackReferences.end()) {
Out << Name << '@';
if (UseNameBackReferences && NameBackReferences.size() < 10) {
if (NameBackReferences.size() < 10) {
size_t Size = NameBackReferences.size();
NameBackReferences[Name] = Size;
}