Remove the useNewMangling function

NFC
Ajisaputrars · Mar 17, 2017 · 0f87b5e · 0f87b5e
1 parent 1625345
commit 0f87b5e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 18 deletions.
diff --git a/include/swift/Demangling/Demangle.h b/include/swift/Demangling/Demangle.h
@@ -491,14 +491,6 @@ NodePointer getUnspecialized(Node *node, NodeFactory &Factory);
 std::string archetypeName(Node::IndexType index, Node::IndexType depth);
 
 } // end namespace Demangle
-
-
-/// Returns true if the new mangling scheme should be used.
-///
-/// TODO: remove this function when the old mangling is removed.
-bool useNewMangling(Demangle::NodePointer Node);
-
-
 } // end namespace swift
 
 #endif // SWIFT_DEMANGLING_DEMANGLE_H
diff --git a/lib/Basic/Mangler.cpp b/lib/Basic/Mangler.cpp
@@ -25,10 +25,6 @@ llvm::cl::opt<bool> NewManglingForTests(
                        "new-mangling-for-tests", llvm::cl::init(false),
                        llvm::cl::desc("Use new mangling for compiler tests"));
 
-bool swift::useNewMangling(Demangle::NodePointer Node) {
-  return true;
-}
-
 #ifndef NDEBUG
 
 llvm::cl::opt<bool> PrintSwiftManglingStats(

diff --git a/lib/IDE/TypeReconstruction.cpp b/lib/IDE/TypeReconstruction.cpp
@@ -1587,8 +1587,7 @@ static void VisitNodeLocalDeclName(
     Demangle::NodePointer &cur_node, VisitNodeResult &result,
     const VisitNodeResult &generic_context) { // set by GenericType case
   Demangle::NodePointer parent_node = nodes[nodes.size() - 2];
-  std::string remangledNode = Demangle::mangleNode(parent_node,
-                                                   useNewMangling(parent_node));
+  std::string remangledNode = Demangle::mangleNode(parent_node);
   TypeDecl *decl = result._module.lookupLocalType(remangledNode);
   if (!decl)
     result._error = stringWithFormat("unable to lookup local type %s",

diff --git a/lib/RemoteAST/RemoteAST.cpp b/lib/RemoteAST/RemoteAST.cpp
@@ -483,7 +483,7 @@ RemoteASTTypeBuilder::createNominalTypeDecl(const Demangle::NodePointer &node) {
   auto DC = findDeclContext(node);
   if (!DC) {
     return fail<NominalTypeDecl*>(Failure::CouldNotResolveTypeDecl,
-                              Demangle::mangleNode(node, useNewMangling(node)));
+                                  Demangle::mangleNode(node));
   }
 
   auto decl = dyn_cast<NominalTypeDecl>(DC);
@@ -547,7 +547,7 @@ RemoteASTTypeBuilder::findDeclContext(const Demangle::NodePointer &node) {
       if (!module) return nullptr;
 
       // Look up the local type by its mangling.
-      auto mangledName = Demangle::mangleNode(node, useNewMangling(node));
+      auto mangledName = Demangle::mangleNode(node);
       auto decl = module->lookupLocalType(mangledName);
       if (!decl) return nullptr;
 

diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp b/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
@@ -1164,7 +1164,7 @@ static std::string mangleSimpleClass(StringRef moduleName,
   typeNode->addChild(classNode, Dem);
   typeManglingNode->addChild(typeNode, Dem);
   globalNode->addChild(typeManglingNode, Dem);
-  return mangleNode(globalNode, swift::useNewMangling(globalNode));
+  return mangleNode(globalNode);
 }
 
 static sourcekitd_response_t

diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
@@ -1588,7 +1588,7 @@ static int doPrintLocalTypes(const CompilerInvocation &InitInvok,
       while (node->getKind() != NodeKind::LocalDeclName)
         node = node->getChild(1); // local decl name
 
-      auto remangled = Demangle::mangleNode(typeNode, useNewMangling(typeNode));
+      auto remangled = Demangle::mangleNode(typeNode);
 
       auto LTD = M->lookupLocalType(remangled);