diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2015-10-06 18:24:33 +0000 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2015-10-06 18:24:33 +0000 |
| commit | 9d1f05aef8a0e39105e39e5ac4be4bfee03a1a52 (patch) | |
| tree | 15a8d1ce213671ad0c8bfd826b9b3f638445d013 | |
| parent | 33bb1a23b334133966976ea44741e1c7253c3267 (diff) | |
| download | bcm5719-llvm-9d1f05aef8a0e39105e39e5ac4be4bfee03a1a52.tar.gz bcm5719-llvm-9d1f05aef8a0e39105e39e5ac4be4bfee03a1a52.zip | |
Make clang_Cursor_getMangling don't mangle if the declaration isn't mangled
Right now clang_Cursor_getMangling will attempt to mangle any
declaration, even if the declaration isn't mangled (extern "C"). This
results in a partially mangled name which isn't useful for much. This
patch makes clang_Cursor_getMangling return an empty string if the
declaration isn't mangled.
Patch by Michael Wu <mwu@mozilla.com>.
llvm-svn: 249437
| -rw-r--r-- | clang/test/Index/print-mangled-name.cpp | 5 | ||||
| -rw-r--r-- | clang/tools/c-index-test/c-index-test.c | 2 | ||||
| -rw-r--r-- | clang/tools/libclang/CIndex.cpp | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/clang/test/Index/print-mangled-name.cpp b/clang/test/Index/print-mangled-name.cpp index 3d74fe5520c..dc6f734dfb7 100644 --- a/clang/test/Index/print-mangled-name.cpp +++ b/clang/test/Index/print-mangled-name.cpp @@ -29,3 +29,8 @@ int foo(S, S&); // ITANIUM: mangled=_Z3foo1SRS_ // MACHO: mangled=__Z3foo1SRS_ // MICROSOFT: mangled=?foo@@YAHUS + +extern "C" int foo(int); +// ITANIUM: mangled=foo +// MACHO: mangled=_foo +// MICROSOFT: mangled=_foo diff --git a/clang/tools/c-index-test/c-index-test.c b/clang/tools/c-index-test/c-index-test.c index eeeb832cd87..6292f73068c 100644 --- a/clang/tools/c-index-test/c-index-test.c +++ b/clang/tools/c-index-test/c-index-test.c @@ -1429,6 +1429,8 @@ static enum CXChildVisitResult PrintTypeSize(CXCursor cursor, CXCursor p, static enum CXChildVisitResult PrintMangledName(CXCursor cursor, CXCursor p, CXClientData d) { + if (clang_isInvalid(clang_getCursorKind(cursor))) + return CXChildVisit_Recurse; CXString MangledName; PrintCursor(cursor, NULL); MangledName = clang_Cursor_getMangling(cursor); diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 7a1fb5b9667..9e66d0c653c 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -3890,7 +3890,11 @@ CXString clang_Cursor_getMangling(CXCursor C) { std::string FrontendBuf; llvm::raw_string_ostream FrontendBufOS(FrontendBuf); - MC->mangleName(ND, FrontendBufOS); + if (MC->shouldMangleDeclName(ND)) { + MC->mangleName(ND, FrontendBufOS); + } else { + ND->printName(FrontendBufOS); + } // Now apply backend mangling. std::unique_ptr<llvm::DataLayout> DL( |
