OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary `llvm::`. 

llvm-svn: 289102
This commit is contained in:
Rui Ueyama 2016-12-08 20:50:47 +00:00
parent 785e7d282c
commit 8fe1767cdd
7 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/Chunks.cpp
View File

@ -226,7 +226,7 @@ void SectionChunk::printDiscardedMessage() const {
// Removed by dead-stripping. If it's removed by ICF, ICF already
// printed out the name, so don't repeat that here.
if (Sym && this == Repl)
llvm::outs() << "Discarded " << Sym->getName() << "\n";
outs() << "Discarded " << Sym->getName() << "\n";
}
StringRef SectionChunk::getDebugName() {

44
lld/COFF/Driver.cpp
View File

@ -43,7 +43,7 @@ namespace coff {
Configuration *Config;
LinkerDriver *Driver;
bool link(llvm::ArrayRef<const char *> Args) {
bool link(ArrayRef<const char *> Args) {
Config = make<Configuration>();
Driver = make<LinkerDriver>();
Driver->link(Args);
@ -94,7 +94,7 @@ static bool isDecorated(StringRef Sym) {
// Parses .drectve section contents and returns a list of files
// specified by /defaultlib.
void LinkerDriver::parseDirectives(StringRef S) {
llvm::opt::InputArgList Args = Parser.parse(S);
opt::InputArgList Args = Parser.parse(S);
for (auto *Arg : Args) {
switch (Arg->getOption().getID()) {
@ -148,12 +148,12 @@ StringRef LinkerDriver::doFindFile(StringRef Filename) {
bool HasExt = (Filename.find('.') != StringRef::npos);
for (StringRef Dir : SearchPaths) {
SmallString<128> Path = Dir;
llvm::sys::path::append(Path, Filename);
if (llvm::sys::fs::exists(Path.str()))
sys::path::append(Path, Filename);
if (sys::fs::exists(Path.str()))
return Alloc.save(Path.str());
if (!HasExt) {
Path.append(".obj");
if (llvm::sys::fs::exists(Path.str()))
if (sys::fs::exists(Path.str()))
return Alloc.save(Path.str());
}
}
@ -254,7 +254,7 @@ static uint64_t getDefaultImageBase() {
return Config->DLL ? 0x10000000 : 0x400000;
}
static std::string createResponseFile(const llvm::opt::InputArgList &Args,
static std::string createResponseFile(const opt::InputArgList &Args,
ArrayRef<MemoryBufferRef> MBs,
ArrayRef<StringRef> SearchPaths) {
SmallString<0> Data;
@ -285,7 +285,7 @@ static std::string createResponseFile(const llvm::opt::InputArgList &Args,
return Data.str();
}
static unsigned getDefaultDebugType(const llvm::opt::InputArgList &Args) {
static unsigned getDefaultDebugType(const opt::InputArgList &Args) {
unsigned DebugTypes = static_cast<unsigned>(DebugType::CV);
if (Args.hasArg(OPT_driver))
DebugTypes |= static_cast<unsigned>(DebugType::PData);
@ -295,7 +295,7 @@ static unsigned getDefaultDebugType(const llvm::opt::InputArgList &Args) {
}
static unsigned parseDebugType(StringRef Arg) {
llvm::SmallVector<StringRef, 3> Types;
SmallVector<StringRef, 3> Types;
Arg.split(Types, ',', /*KeepEmpty=*/false);
unsigned DebugTypes = static_cast<unsigned>(DebugType::None);
@ -307,7 +307,7 @@ static unsigned parseDebugType(StringRef Arg) {
return DebugTypes;
}
void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
// If the first command line argument is "/lib", link.exe acts like lib.exe.
// We call our own implementation of lib.exe that understands bitcode files.
if (ArgsArr.size() > 1 && StringRef(ArgsArr[1]).equals_lower("/lib")) {
@ -317,15 +317,15 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
}
// Needed for LTO.
llvm::InitializeAllTargetInfos();
llvm::InitializeAllTargets();
llvm::InitializeAllTargetMCs();
llvm::InitializeAllAsmParsers();
llvm::InitializeAllAsmPrinters();
llvm::InitializeAllDisassemblers();
InitializeAllTargetInfos();
InitializeAllTargets();
InitializeAllTargetMCs();
InitializeAllAsmParsers();
InitializeAllAsmPrinters();
InitializeAllDisassemblers();
// Parse command line options.
llvm::opt::InputArgList Args = Parser.parseLINK(ArgsArr.slice(1));
opt::InputArgList Args = Parser.parseLINK(ArgsArr.slice(1));
// Handle /help
if (Args.hasArg(OPT_help)) {
@ -335,13 +335,13 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
if (auto *Arg = Args.getLastArg(OPT_linkrepro)) {
SmallString<64> Path = StringRef(Arg->getValue());
llvm::sys::path::append(Path, "repro");
sys::path::append(Path, "repro");
ErrorOr<CpioFile *> F = CpioFile::create(Path);
if (F)
Cpio.reset(*F);
else
llvm::errs() << "/linkrepro: failed to open " << Path
<< ".cpio: " << F.getError().message() << '\n';
errs() << "/linkrepro: failed to open " << Path
<< ".cpio: " << F.getError().message() << '\n';
}
if (Args.filtered_begin(OPT_INPUT) == Args.filtered_end())
@ -584,7 +584,7 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
" conflicts with " + machineToStr(Config->Machine));
}
if (Config->Machine == IMAGE_FILE_MACHINE_UNKNOWN) {
llvm::errs() << "warning: /machine is not specified. x64 is assumed.\n";
errs() << "warning: /machine is not specified. x64 is assumed.\n";
Config->Machine = AMD64;
}
@ -625,7 +625,7 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
fatal("entry point must be defined");
Config->Entry = addUndefined(S);
if (Config->Verbose)
llvm::outs() << "Entry name inferred: " << S << "\n";
outs() << "Entry name inferred: " << S << "\n";
}
// Handle /export
@ -765,7 +765,7 @@ void LinkerDriver::link(llvm::ArrayRef<const char *> ArgsArr) {
// to help debugging.
if (auto *Arg = Args.getLastArg(OPT_lldmap)) {
std::error_code EC;
llvm::raw_fd_ostream Out(Arg->getValue(), EC, OpenFlags::F_Text);
raw_fd_ostream Out(Arg->getValue(), EC, OpenFlags::F_Text);
if (EC)
fatal(EC, "could not create the symbol map");
Symtab.printMap(Out);

43
lld/COFF/DriverUtils.cpp
View File

@ -49,23 +49,23 @@ public:
void add(const char *S) { Args.push_back(Saver.save(S).data()); }
void run() {
ErrorOr<std::string> ExeOrErr = llvm::sys::findProgramByName(Prog);
ErrorOr<std::string> ExeOrErr = sys::findProgramByName(Prog);
if (auto EC = ExeOrErr.getError())
fatal(EC, "unable to find " + Prog + " in PATH: ");
const char *Exe = Saver.save(*ExeOrErr).data();
Args.insert(Args.begin(), Exe);
Args.push_back(nullptr);
if (llvm::sys::ExecuteAndWait(Args[0], Args.data()) != 0) {
if (sys::ExecuteAndWait(Args[0], Args.data()) != 0) {
for (const char *S : Args)
if (S)
llvm::errs() << S << " ";
errs() << S << " ";
fatal("ExecuteAndWait failed");
}
}
private:
llvm::BumpPtrAllocator Alloc;
llvm::StringSaver Saver;
BumpPtrAllocator Alloc;
StringSaver Saver;
StringRef Prog;
std::vector<const char *> Args;
};
@ -166,8 +166,8 @@ void parseMerge(StringRef S) {
if (!Inserted) {
StringRef Existing = Pair.first->second;
if (Existing != To)
llvm::errs() << "warning: " << S << ": already merged into "
<< Existing << "\n";
errs() << "warning: " << S << ": already merged into " << Existing
<< "\n";
}
}
@ -322,7 +322,7 @@ TemporaryFile createDefaultXml() {
// Open the temporary file for writing.
std::error_code EC;
llvm::raw_fd_ostream OS(File.Path, EC, sys::fs::F_Text);
raw_fd_ostream OS(File.Path, EC, sys::fs::F_Text);
if (EC)
fatal(EC, "failed to open " + File.Path);
@ -389,7 +389,7 @@ std::unique_ptr<MemoryBuffer> createManifestRes() {
// Open the temporary file for writing.
std::error_code EC;
llvm::raw_fd_ostream Out(RCFile.Path, EC, sys::fs::F_Text);
raw_fd_ostream Out(RCFile.Path, EC, sys::fs::F_Text);
if (EC)
fatal(EC, "failed to open " + RCFile.Path);
@ -421,7 +421,7 @@ void createSideBySideManifest() {
if (Path == "")
Path = Config->OutputFile + ".manifest";
std::error_code EC;
llvm::raw_fd_ostream Out(Path, EC, llvm::sys::fs::F_Text);
raw_fd_ostream Out(Path, EC, sys::fs::F_Text);
if (EC)
fatal(EC, "failed to create manifest");
Out << createManifestXml();
@ -539,7 +539,7 @@ void fixupExports() {
Export *Existing = Pair.first->second;
if (E == *Existing || E.Name != Existing->Name)
continue;
llvm::errs() << "warning: duplicate /export option: " << E.Name << "\n";
errs() << "warning: duplicate /export option: " << E.Name << "\n";
}
Config->Exports = std::move(V);
@ -601,7 +601,7 @@ convertResToCOFF(const std::vector<MemoryBufferRef> &MBs) {
TemporaryFile& ResFile = ResFiles.back();
// Write the content of the resource in a temporary file
std::error_code EC;
llvm::raw_fd_ostream OS(ResFile.Path, EC, sys::fs::F_None);
raw_fd_ostream OS(ResFile.Path, EC, sys::fs::F_None);
if (EC)
fatal(EC, "failed to open " + ResFile.Path);
OS << MB.getBuffer();
@ -638,7 +638,7 @@ public:
};
// Parses a given list of options.
llvm::opt::InputArgList ArgParser::parse(ArrayRef<const char *> ArgsArr) {
opt::InputArgList ArgParser::parse(ArrayRef<const char *> ArgsArr) {
// First, replace respnose files (@<file>-style options).
std::vector<const char *> Argv = replaceResponseFiles(ArgsArr);
@ -646,28 +646,27 @@ llvm::opt::InputArgList ArgParser::parse(ArrayRef<const char *> ArgsArr) {
COFFOptTable Table;
unsigned MissingIndex;
unsigned MissingCount;
llvm::opt::InputArgList Args =
Table.ParseArgs(Argv, MissingIndex, MissingCount);
opt::InputArgList Args = Table.ParseArgs(Argv, MissingIndex, MissingCount);
// Print the real command line if response files are expanded.
if (Args.hasArg(OPT_verbose) && ArgsArr.size() != Argv.size()) {
llvm::outs() << "Command line:";
outs() << "Command line:";
for (const char *S : Argv)
llvm::outs() << " " << S;
llvm::outs() << "\n";
outs() << " " << S;
outs() << "\n";
}
if (MissingCount)
fatal(Twine(Args.getArgString(MissingIndex)) + ": missing argument");
for (auto *Arg : Args.filtered(OPT_UNKNOWN))
llvm::errs() << "ignoring unknown argument: " << Arg->getSpelling() << "\n";
errs() << "ignoring unknown argument: " << Arg->getSpelling() << "\n";
return Args;
}
// link.exe has an interesting feature. If LINK environment exists,
// its contents are handled as a command line string. So you can pass
// extra arguments using the environment variable.
llvm::opt::InputArgList ArgParser::parseLINK(ArrayRef<const char *> Args) {
opt::InputArgList ArgParser::parseLINK(ArrayRef<const char *> Args) {
// Concatenate LINK env and command line arguments, and then parse them.
Optional<std::string> Env = Process::GetEnv("LINK");
if (!Env)
@ -680,7 +679,7 @@ llvm::opt::InputArgList ArgParser::parseLINK(ArrayRef<const char *> Args) {
std::vector<const char *> ArgParser::tokenize(StringRef S) {
SmallVector<const char *, 16> Tokens;
StringSaver Saver(AllocAux);
llvm::cl::TokenizeWindowsCommandLine(S, Saver, Tokens);
cl::TokenizeWindowsCommandLine(S, Saver, Tokens);
return std::vector<const char *>(Tokens.begin(), Tokens.end());
}
@ -696,7 +695,7 @@ ArgParser::replaceResponseFiles(std::vector<const char *> Argv) {
void printHelp(const char *Argv0) {
COFFOptTable Table;
Table.PrintHelp(llvm::outs(), Argv0, "LLVM Linker", false);
Table.PrintHelp(outs(), Argv0, "LLVM Linker", false);
}
} // namespace coff

6
lld/COFF/InputFiles.cpp
View File

@ -44,7 +44,7 @@ namespace lld {
namespace coff {
int InputFile::NextIndex = 0;
llvm::LLVMContext BitcodeFile::Context;
LLVMContext BitcodeFile::Context;
std::mutex BitcodeFile::Mu;
ArchiveFile::ArchiveFile(MemoryBufferRef M) : InputFile(ArchiveKind, M) {}
@ -167,7 +167,7 @@ void ObjectFile::initializeSymbols() {
uint32_t NumSymbols = COFFObj->getNumberOfSymbols();
SymbolBodies.reserve(NumSymbols);
SparseSymbolBodies.resize(NumSymbols);
llvm::SmallVector<std::pair<Undefined *, uint32_t>, 8> WeakAliases;
SmallVector<std::pair<Undefined *, uint32_t>, 8> WeakAliases;
int32_t LastSectionNumber = 0;
for (uint32_t I = 0; I < NumSymbols; ++I) {
// Get a COFFSymbolRef object.
@ -339,7 +339,7 @@ void BitcodeFile::parse() {
Context, MB.getBufferStart(), MB.getBufferSize(), llvm::TargetOptions());
M = check(std::move(ModOrErr), "could not create LTO module");
llvm::StringSaver Saver(Alloc);
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/Librarian.cpp
View File

@ -463,7 +463,7 @@ void lld::coff::writeImportLibrary() {
std::vector<NewArchiveMember> Members;
std::string Path = getImplibPath();
std::string DLLName = llvm::sys::path::filename(Config->OutputFile);
std::string DLLName = sys::path::filename(Config->OutputFile);
ObjectFactory OF(DLLName);
std::vector<uint8_t> ImportDescriptor;

17
lld/COFF/SymbolTable.cpp
View File

@ -71,7 +71,7 @@ void SymbolTable::readArchives() {
for (std::future<ArchiveFile *> &Future : ArchiveQueue) {
ArchiveFile *File = Future.get();
if (Config->Verbose)
llvm::outs() << "Reading " << toString(File) << "\n";
outs() << "Reading " << toString(File) << "\n";
for (Lazy &Sym : File->getLazySymbols())
addLazy(&Sym, &LazySyms);
}
@ -92,7 +92,7 @@ void SymbolTable::readObjects() {
for (size_t I = 0; I < ObjectQueue.size(); ++I) {
InputFile *File = ObjectQueue[I].get();
if (Config->Verbose)
llvm::outs() << "Reading " << toString(File) << "\n";
outs() << "Reading " << toString(File) << "\n";
// Adding symbols may add more files to ObjectQueue
// (but not to ArchiveQueue).
for (SymbolBody *Sym : File->getSymbols())
@ -102,7 +102,7 @@ void SymbolTable::readObjects() {
if (!S.empty()) {
Directives.push_back(S);
if (Config->Verbose)
llvm::outs() << "Directives: " << toString(File) << ": " << S << "\n";
outs() << "Directives: " << toString(File) << ": " << S << "\n";
}
}
ObjectQueue.clear();
@ -118,7 +118,7 @@ bool SymbolTable::queueEmpty() {
}
void SymbolTable::reportRemainingUndefines(bool Resolve) {
llvm::SmallPtrSet<SymbolBody *, 8> Undefs;
SmallPtrSet<SymbolBody *, 8> Undefs;
for (auto &I : Symtab) {
Symbol *Sym = I.second;
auto *Undef = dyn_cast<Undefined>(Sym->Body);
@ -155,13 +155,13 @@ void SymbolTable::reportRemainingUndefines(bool Resolve) {
return;
for (Undefined *U : Config->GCRoot)
if (Undefs.count(U->repl()))
llvm::errs() << "<root>: undefined symbol: " << U->getName() << "\n";
errs() << "<root>: undefined symbol: " << U->getName() << "\n";
for (InputFile *File : Files)
if (!isa<ArchiveFile>(File))
for (SymbolBody *Sym : File->getSymbols())
if (Undefs.count(Sym->repl()))
llvm::errs() << toString(File)
<< ": undefined symbol: " << Sym->getName() << "\n";
errs() << toString(File) << ": undefined symbol: " << Sym->getName()
<< "\n";
if (!Config->Force)
fatal("link failed");
}
@ -237,8 +237,7 @@ void SymbolTable::addMemberFile(Lazy *Body) {
if (!File)
return;
if (Config->Verbose)
llvm::outs() << "Loaded " << toString(File) << " for " << Body->getName()
<< "\n";
outs() << "Loaded " << toString(File) << " for " << Body->getName() << "\n";
addFile(File);
}

6
lld/COFF/Writer.cpp
View File

@ -134,9 +134,9 @@ private:
std::map<StringRef, std::vector<DefinedImportData *>> binImports();
SymbolTable *Symtab;
std::unique_ptr<llvm::FileOutputBuffer> Buffer;
llvm::SpecificBumpPtrAllocator<OutputSection> CAlloc;
llvm::SpecificBumpPtrAllocator<BaserelChunk> BAlloc;
std::unique_ptr<FileOutputBuffer> Buffer;
SpecificBumpPtrAllocator<OutputSection> CAlloc;
SpecificBumpPtrAllocator<BaserelChunk> BAlloc;
std::vector<OutputSection *> OutputSections;
std::vector<char> Strtab;
std::vector<llvm::object::coff_symbol16> OutputSymtab;