Revert r249437

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249440 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Index/print-mangled-name.cpp b/test/Index/print-mangled-name.cpp
index dc6f734dfb734cf8ca1980e04d9ccff4296ff388..3d74fe5520cc2b69d151145112ba88c90c8d2144 100644 (file)
--- 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 6292f73068cccdee3e88afcff6d3b1cad14ddd54..eeeb832cd873890f3439da8311fd5fb479185a82 100644 (file)
--- 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 9e66d0c653c85477d72b34c90c23772f668f3461..7a1fb5b966787451859ee8c61f597487bf542bb4 100644 (file)
--- 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<llvm::DataLayout> DL(