dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Index: provide adjustment thunk information for C++ manglings 

Add support for exposing the adjustment thunk for virtual methods as
appropriate.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260011 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Saleem Abdulrasool 2016-02-06 22:36:34 +00:00
parent 4404328870
commit d014d429aa
2 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/Index/print-cxx-manglings.cpp
View File

@ -64,3 +64,33 @@ struct v {
// MSVC: CXXConstructor=v{{.*}}[mangled=??0v@@QAE@H@Z] [mangled=??_Fv@@QAEXXZ]
struct w {
virtual int m(int);
};
// ITANIUM: CXXMethod=m{{.*}} (virtual) [mangled=_ZN1w1mEi]
// MACHO: CXXMethod=m{{.*}} (virtual) [mangled=__ZN1w1mEi]
// MSVC: CXXMethod=m{{.*}} (virtual) [mangled=?m@w@@UAEHH@Z]
struct x {
virtual int m(int);
};
// ITANIUM: CXXMethod=m{{.*}} (virtual) [mangled=_ZN1x1mEi]
// MACHO: CXXMethod=m{{.*}} (virtual) [mangled=__ZN1x1mEi]
// MSVC: CXXMethod=m{{.*}} (virtual) [mangled=?m@x@@UAEHH@Z]
struct y : w, x {
virtual int m(int);
};
// ITANIUM: CXXMethod=m{{.*}} (virtual) {{.*}} [mangled=_ZN1y1mEi] [mangled=_ZThn4_N1y1mEi]
// MACHO: CXXMethod=m{{.*}} (virtual) {{.*}} [mangled=__ZN1y1mEi] [mangled=__ZThn4_N1y1mEi]
// MSVC: CXXMethod=m{{.*}} (virtual) {{.*}} [mangled=?m@y@@UAEHH@Z] [mangled=?m@y@@W3AEHH@Z]

39
tools/libclang/CIndex.cpp
View File

@ -24,6 +24,7 @@
#include "clang/AST/Attr.h"
#include "clang/AST/Mangle.h"
#include "clang/AST/StmtVisitor.h"
#include "clang/AST/VTableBuilder.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticCategories.h"
#include "clang/Basic/DiagnosticIDs.h"
@ -4368,6 +4369,38 @@ CXString clang_Cursor_getMangling(CXCursor C) {
return cxstring::createDup(FinalBufOS.str());
}
static std::string getMangledName(std::unique_ptr<MangleContext> &M,
std::unique_ptr<llvm::DataLayout> &DL,
const NamedDecl *ND) {
std::string FrontendBuf;
llvm::raw_string_ostream FOS(FrontendBuf);
M->mangleName(ND, FOS);
std::string BackendBuf;
llvm::raw_string_ostream BOS(BackendBuf);
llvm::Mangler::getNameWithPrefix(BOS, llvm::Twine(FOS.str()), *DL);
return BOS.str();
}
static std::string getMangledThunk(std::unique_ptr<MangleContext> &M,
std::unique_ptr<llvm::DataLayout> &DL,
const CXXMethodDecl *MD, const ThunkInfo &T) {
std::string FrontendBuf;
llvm::raw_string_ostream FOS(FrontendBuf);
M->mangleThunk(MD, T, FOS);
std::string BackendBuf;
llvm::raw_string_ostream BOS(BackendBuf);
llvm::Mangler::getNameWithPrefix(BOS, llvm::Twine(FOS.str()), *DL);
return BOS.str();
}
CXStringSet *clang_Cursor_getCXXManglings(CXCursor C) {
if (clang_isInvalid(C.kind) || !clang_isDeclaration(C.kind))
return nullptr;
@ -4411,6 +4444,12 @@ CXStringSet *clang_Cursor_getCXXManglings(CXCursor C) {
if (DD->isVirtual())
Manglings.emplace_back(getMangledStructor(M, DL, DD, Dtor_Deleting));
}
} else if (const auto *MD = dyn_cast_or_null<CXXMethodDecl>(ND)) {
Manglings.emplace_back(getMangledName(M, DL, ND));
if (MD->isVirtual())
if (const auto *TIV = Ctx.getVTableContext()->getThunkInfo(MD))
for (const auto &T : *TIV)
Manglings.emplace_back(getMangledThunk(M, DL, MD, T));
}
return cxstring::createSet(Manglings);