From 1233ac35f7f21dde56c073307c15a5a972aec084 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 6 Oct 2015 18:53:12 +0000 Subject: [PATCH] Revert r249437 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249440 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Index/print-mangled-name.cpp | 5 ----- tools/c-index-test/c-index-test.c | 2 -- tools/libclang/CIndex.cpp | 6 +----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/test/Index/print-mangled-name.cpp b/test/Index/print-mangled-name.cpp index dc6f734dfb..3d74fe5520 100644 --- a/test/Index/print-mangled-name.cpp +++ b/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/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c index 6292f73068..eeeb832cd8 100644 --- a/tools/c-index-test/c-index-test.c +++ b/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/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 9e66d0c653..7a1fb5b966 100644 --- a/tools/libclang/CIndex.cpp +++ b/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 DL( -- 2.40.0