intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-22 23:49:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update for llvm api change.

Browse Source 
llvm-svn: 244856
This commit is contained in:
Rafael Espindola
2015-08-13 01:07:08 +00:00
parent 817d962ef0
commit f0461ba985
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lld/COFF/Driver.h
View File

@@ -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.

6
lld/COFF/DriverUtils.cpp
View File

@@ -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());
}

2
lld/COFF/InputFiles.cpp
View File

@@ -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)

2
lld/COFF/InputFiles.h
View File

@@ -188,7 +188,7 @@ private:
std::vector<SymbolBody *> SymbolBodies;
llvm::BumpPtrAllocator Alloc;
llvm::BumpPtrAllocator StringAllocAux;
llvm::BumpPtrStringSaver StringAlloc;
llvm::StringSaver StringAlloc;
};
// Used for LTO.

6
lld/COFF/ModuleDef.cpp
View File

@@ -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();
}

2
lld/lib/Driver/GnuLdDriver.cpp
View File

@@ -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.