Update for llvm api change.
llvm-svn: 244856
diff --git a/lld/COFF/Driver.h b/lld/COFF/Driver.h
index a39ce1d..dc21597 100644
--- a/lld/COFF/Driver.h
+++ b/lld/COFF/Driver.h
@@ -56,7 +56,7 @@
std::vector<const char *> replaceResponseFiles(std::vector<const char *>);
llvm::BumpPtrAllocator AllocAux;
- llvm::BumpPtrStringSaver Alloc;
+ llvm::StringSaver Alloc;
};
class LinkerDriver {
@@ -69,7 +69,7 @@
private:
llvm::BumpPtrAllocator AllocAux;
- llvm::BumpPtrStringSaver Alloc;
+ llvm::StringSaver Alloc;
ArgParser Parser;
SymbolTable Symtab;
@@ -107,7 +107,7 @@
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 1ec8363..d3f7268 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -66,7 +66,7 @@
private:
llvm::BumpPtrAllocator Alloc;
- llvm::BumpPtrStringSaver Saver;
+ llvm::StringSaver Saver;
StringRef Prog;
std::vector<const char *> Args;
};
@@ -583,7 +583,7 @@
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::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 7db946d..538b6bb 100644
--- a/lld/COFF/InputFiles.cpp
+++ b/lld/COFF/InputFiles.cpp
@@ -318,7 +318,7 @@
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 63ab3be..5f78497 100644
--- a/lld/COFF/InputFiles.h
+++ b/lld/COFF/InputFiles.h
@@ -188,7 +188,7 @@
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 57d9f22..fab3e4a 100644
--- a/lld/COFF/ModuleDef.cpp
+++ b/lld/COFF/ModuleDef.cpp
@@ -109,7 +109,7 @@
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 @@
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 0e7eb8e..c78759e 100644
--- a/lld/lib/Driver/GnuLdDriver.cpp
+++ b/lld/lib/Driver/GnuLdDriver.cpp
@@ -89,7 +89,7 @@
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.