When mangling member function pointers, fake adding a substitution corresponding to the function type.

llvm-svn: 105310
This commit is contained in:
Anders Carlsson 2010-06-02 04:29:50 +00:00
parent 58ec0483b7
commit d563923cf1
2 changed files with 38 additions and 6 deletions

View File

@ -125,19 +125,24 @@ class CXXNameMangler {
const CXXMethodDecl *Structor;
unsigned StructorType;
/// SeqID - The next subsitution sequence number.
unsigned SeqID;
llvm::DenseMap<uintptr_t, unsigned> Substitutions;
ASTContext &getASTContext() const { return Context.getASTContext(); }
public:
CXXNameMangler(MangleContext &C, llvm::SmallVectorImpl<char> &Res)
: Context(C), Out(Res), Structor(0), StructorType(0) { }
: Context(C), Out(Res), Structor(0), StructorType(0), SeqID(0) { }
CXXNameMangler(MangleContext &C, llvm::SmallVectorImpl<char> &Res,
const CXXConstructorDecl *D, CXXCtorType Type)
: Context(C), Out(Res), Structor(getStructor(D)), StructorType(Type) { }
: Context(C), Out(Res), Structor(getStructor(D)), StructorType(Type),
SeqID(0) { }
CXXNameMangler(MangleContext &C, llvm::SmallVectorImpl<char> &Res,
const CXXDestructorDecl *D, CXXDtorType Type)
: Context(C), Out(Res), Structor(getStructor(D)), StructorType(Type) { }
: Context(C), Out(Res), Structor(getStructor(D)), StructorType(Type),
SeqID(0) { }
#if MANGLE_CHECKER
~CXXNameMangler() {
@ -1204,6 +1209,22 @@ void CXXNameMangler::mangleType(const MemberPointerType *T) {
if (const FunctionProtoType *FPT = dyn_cast<FunctionProtoType>(PointeeType)) {
mangleQualifiers(Qualifiers::fromCVRMask(FPT->getTypeQuals()));
mangleType(FPT);
// Itanium C++ ABI 5.1.8:
//
// The type of a non-static member function is considered to be different,
// for the purposes of substitution, from the type of a namespace-scope or
// static member function whose type appears similar. The types of two
// non-static member functions are considered to be different, for the
// purposes of substitution, if the functions are members of different
// classes. In other words, for the purposes of substitution, the class of
// which the function is a member is considered part of the type of
// function.
// We increment the SeqID here to emulate adding an entry to the
// substitution table. We can't actually add it because we don't want this
// particular function type to be substituted.
++SeqID;
} else
mangleType(PointeeType);
}
@ -2049,10 +2070,8 @@ void CXXNameMangler::addSubstitution(TemplateName Template) {
}
void CXXNameMangler::addSubstitution(uintptr_t Ptr) {
unsigned SeqID = Substitutions.size();
assert(!Substitutions.count(Ptr) && "Substitution already exists!");
Substitutions[Ptr] = SeqID;
Substitutions[Ptr] = SeqID++;
}
//

View File

@ -67,3 +67,16 @@ namespace NS {
// CHECK: @_ZN2NS1fERNS_1CE
void f(C&) { }
}
namespace Test1 {
struct A { };
struct B { };
// CHECK: @_ZN5Test11fEMNS_1BEFvvENS_1AES3_
void f(void (B::*)(), A, A) { }
// CHECK: @_ZN5Test11fEMNS_1BEFvvENS_1AES3_MS0_FvS3_EMS3_FvvE
void f(void (B::*)(), A, A, void (B::*)(A), void (A::*)()) { }
}