ASTMangler: Rename mangleTypeAsUSR() to mangleTypeWithoutPrefix()

Author: slavapestov

include/swift/AST/ASTMangler.h

@@ -164,8 +164,9 @@ class ASTMangler : public Mangler {
 
   std::string mangleObjCRuntimeName(const NominalTypeDecl *Nominal);
 
-  std::string mangleTypeAsUSR(Type type) {
-    return mangleTypeWithoutPrefix(type);
+  std::string mangleTypeWithoutPrefix(Type type) {
+    appendType(type);
+    return finalize();
   }
 
   std::string mangleTypeAsContextUSR(const NominalTypeDecl *type);
@@ -319,11 +320,6 @@ class ASTMangler : public Mangler {
   void appendOpParamForLayoutConstraint(LayoutConstraint Layout);
 
   void appendSymbolicReference(SymbolicReferent referent);
-  
-  std::string mangleTypeWithoutPrefix(Type type) {
-    appendType(type);
-    return finalize();
-  }
 };
 
 } // end namespace Mangle

lib/SIL/SILDefaultWitnessTable.cpp

@@ -97,7 +97,7 @@ convertToDefinition(ArrayRef<Entry> entries) {
 
 std::string SILDefaultWitnessTable::getUniqueName() const {
   Mangle::ASTMangler Mangler;
-  return Mangler.mangleTypeAsUSR(getProtocol()->getDeclaredType());
+  return Mangler.mangleTypeWithoutPrefix(getProtocol()->getDeclaredType());
 }
 
 SILDefaultWitnessTable::~SILDefaultWitnessTable() {