maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Simplify FileNode. 

The member function was defined to allow subclasses to customize
error message. But since we only have one FileNode type, there's
no actual need for that.

llvm-svn: 226139
This commit is contained in:
Rui Ueyama 2015-01-15 07:15:36 +00:00
parent f0982d0ac6
commit 56206368f5
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/include/lld/Core/InputGraph.h
View File

@ -149,12 +149,6 @@ public:
return a->kind() == InputElement::Kind::File;
}
/// \brief create an error string for printing purposes
virtual std::string errStr(std::error_code errc) {
std::string msg = errc.message();
return (Twine("Cannot open ") + _path + ": " + msg).str();
}
/// \brief Get the list of files
File *getFile() { return _file.get(); }

8
lld/lib/Driver/Driver.cpp
View File

@ -94,10 +94,12 @@ bool Driver::link(LinkingContext &context, raw_ostream &diagnostics) {
llvm::raw_string_ostream stream(buf);
if (std::error_code ec = ie->parse(context, stream)) {
if (FileNode *fileNode = dyn_cast<FileNode>(ie.get()))
stream << fileNode->errStr(ec) << "\n";
else
if (FileNode *fileNode = dyn_cast<FileNode>(ie.get())) {
stream << "Cannot open " + fileNode->getFile()->path()
<< ": " << ec.message() << "\n";
} else {
llvm_unreachable("Unknown type of input element");
}
fail = true;
}