diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2015-10-06 18:53:12 +0000 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2015-10-06 18:53:12 +0000 |
| commit | c9d174fae5620aa76af89db98962e55d6705b220 (patch) | |
| tree | 23046460b9ba0a736ca74b3a33a6c67233f7eb57 | |
| parent | e4088b5d3104d1e5824544aa9e52e8101a11b7ec (diff) | |
| download | bcm5719-llvm-c9d174fae5620aa76af89db98962e55d6705b220.tar.gz bcm5719-llvm-c9d174fae5620aa76af89db98962e55d6705b220.zip | |
Revert r249437
llvm-svn: 249440
| -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, 1 insertions, 12 deletions
diff --git a/clang/test/Index/print-mangled-name.cpp b/clang/test/Index/print-mangled-name.cpp index dc6f734dfb7..3d74fe5520c 100644 --- a/clang/test/Index/print-mangled-name.cpp +++ b/clang/test/Index/print-mangled-name.cpp @@ -29,8 +29,3 @@ 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 6292f73068c..eeeb832cd87 100644 --- a/clang/tools/c-index-test/c-index-test.c +++ b/clang/tools/c-index-test/c-index-test.c @@ -1429,8 +1429,6 @@ 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 9e66d0c653c..7a1fb5b9667 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -3890,11 +3890,7 @@ CXString clang_Cursor_getMangling(CXCursor C) { std::string FrontendBuf; llvm::raw_string_ostream FrontendBufOS(FrontendBuf); - if (MC->shouldMangleDeclName(ND)) { - MC->mangleName(ND, FrontendBufOS); - } else { - ND->printName(FrontendBufOS); - } + MC->mangleName(ND, FrontendBufOS); // Now apply backend mangling. std::unique_ptr<llvm::DataLayout> DL( |
