diff --git a/lld/COFF/Driver.h b/lld/COFF/Driver.h
index a39ce1daab2d..dc215978151e 100644
--- a/lld/COFF/Driver.h
+++ b/lld/COFF/Driver.h
@@ -56,7 +56,7 @@ private:
   std::vector<const char *> replaceResponseFiles(std::vector<const char *>);
 
   llvm::BumpPtrAllocator AllocAux;
-  llvm::BumpPtrStringSaver Alloc;
+  llvm::StringSaver Alloc;
 };
 
 class LinkerDriver {
@@ -69,7 +69,7 @@ public:
 
 private:
   llvm::BumpPtrAllocator AllocAux;
-  llvm::BumpPtrStringSaver Alloc;
+  llvm::StringSaver Alloc;
   ArgParser Parser;
   SymbolTable Symtab;
 
@@ -107,7 +107,7 @@ private:
   std::vector<std::unique_ptr<MemoryBuffer>> OwningMBs;
 };
 
-void parseModuleDefs(MemoryBufferRef MB, llvm::BumpPtrStringSaver *Alloc);
+void parseModuleDefs(MemoryBufferRef MB, llvm::StringSaver *Alloc);
 void writeImportLibrary();
 
 // Functions below this line are defined in DriverUtils.cpp.
diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index 1ec83636cb9f..d3f726816cd3 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -66,7 +66,7 @@ public:
 
 private:
   llvm::BumpPtrAllocator Alloc;
-  llvm::BumpPtrStringSaver Saver;
+  llvm::StringSaver Saver;
   StringRef Prog;
   std::vector<const char *> Args;
 };
@@ -583,7 +583,7 @@ llvm::opt::InputArgList ArgParser::parseLINK(ArrayRef<const char *> Args) {
 
 std::vector<const char *> ArgParser::tokenize(StringRef S) {
   SmallVector<const char *, 16> Tokens;
-  BumpPtrStringSaver Saver(AllocAux);
+  StringSaver Saver(AllocAux);
   llvm::cl::TokenizeWindowsCommandLine(S, Saver, Tokens);
   return std::vector<const char *>(Tokens.begin(), Tokens.end());
 }
@@ -593,7 +593,7 @@ std::vector<const char *> ArgParser::tokenize(StringRef S) {
 std::vector<const char *>
 ArgParser::replaceResponseFiles(std::vector<const char *> Argv) {
   SmallVector<const char *, 256> Tokens(Argv.data(), Argv.data() + Argv.size());
-  BumpPtrStringSaver Saver(AllocAux);
+  StringSaver Saver(AllocAux);
   ExpandResponseFiles(Saver, TokenizeWindowsCommandLine, Tokens);
   return std::vector<const char *>(Tokens.begin(), Tokens.end());
 }
diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp
index 7db946df1f46..538b6bbcdfbc 100644
--- a/lld/COFF/InputFiles.cpp
+++ b/lld/COFF/InputFiles.cpp
@@ -318,7 +318,7 @@ void BitcodeFile::parse() {
   if (!Err.empty())
     error(Err);
 
-  llvm::BumpPtrStringSaver Saver(Alloc);
+  llvm::StringSaver Saver(Alloc);
   for (unsigned I = 0, E = M->getSymbolCount(); I != E; ++I) {
     lto_symbol_attributes Attrs = M->getSymbolAttributes(I);
     if ((Attrs & LTO_SYMBOL_SCOPE_MASK) == LTO_SYMBOL_SCOPE_INTERNAL)
diff --git a/lld/COFF/InputFiles.h b/lld/COFF/InputFiles.h
index 63ab3beb2fe6..5f784975c55b 100644
--- a/lld/COFF/InputFiles.h
+++ b/lld/COFF/InputFiles.h
@@ -188,7 +188,7 @@ private:
   std::vector<SymbolBody *> SymbolBodies;
   llvm::BumpPtrAllocator Alloc;
   llvm::BumpPtrAllocator StringAllocAux;
-  llvm::BumpPtrStringSaver StringAlloc;
+  llvm::StringSaver StringAlloc;
 };
 
 // Used for LTO.
diff --git a/lld/COFF/ModuleDef.cpp b/lld/COFF/ModuleDef.cpp
index 57d9f22bfe03..fab3e4a18521 100644
--- a/lld/COFF/ModuleDef.cpp
+++ b/lld/COFF/ModuleDef.cpp
@@ -109,7 +109,7 @@ private:
 
 class Parser {
 public:
-  explicit Parser(StringRef S, BumpPtrStringSaver *A) : Lex(S), Alloc(A) {}
+  explicit Parser(StringRef S, StringSaver *A) : Lex(S), Alloc(A) {}
 
   void parse() {
     do {
@@ -270,12 +270,12 @@ private:
   Lexer Lex;
   Token Tok;
   std::vector<Token> Stack;
-  BumpPtrStringSaver *Alloc;
+  StringSaver *Alloc;
 };
 
 } // anonymous namespace
 
-void parseModuleDefs(MemoryBufferRef MB, BumpPtrStringSaver *Alloc) {
+void parseModuleDefs(MemoryBufferRef MB, StringSaver *Alloc) {
   Parser(MB.getBuffer(), Alloc).parse();
 }
 
diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp
index 0e7eb8e84a01..c78759ed16b4 100644
--- a/lld/lib/Driver/GnuLdDriver.cpp
+++ b/lld/lib/Driver/GnuLdDriver.cpp
@@ -89,7 +89,7 @@ maybeExpandResponseFiles(llvm::ArrayRef<const char *> args,
   SmallVector<const char *, 256> smallvec;
   for (const char *arg : args)
     smallvec.push_back(arg);
-  llvm::BumpPtrStringSaver saver(alloc);
+  llvm::StringSaver saver(alloc);
   llvm::cl::ExpandResponseFiles(saver, llvm::cl::TokenizeGNUCommandLine, smallvec);
 
   // Pack the results to a C-array and return it.