[lld] r210689 - Use std::error_code instead of llvm::error_code.
Rafael Espindola
rafael.espindola at gmail.com
Wed Jun 11 12:05:58 PDT 2014
Author: rafael
Date: Wed Jun 11 14:05:58 2014
New Revision: 210689
URL: http://llvm.org/viewvc/llvm-project?rev=210689&view=rev
Log:
Use std::error_code instead of llvm::error_code.
This is an update for a llvm api change.
Modified:
lld/trunk/include/lld/Core/Error.h
lld/trunk/include/lld/Core/LLVM.h
lld/trunk/include/lld/Driver/CoreInputGraph.h
lld/trunk/lib/Core/Error.cpp
lld/trunk/lib/Driver/GnuLdDriver.cpp
lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.h
lld/trunk/lib/ReaderWriter/Reader.cpp
lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
Modified: lld/trunk/include/lld/Core/Error.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Error.h?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Error.h (original)
+++ lld/trunk/include/lld/Core/Error.h Wed Jun 11 14:05:58 2014
@@ -95,8 +95,7 @@ llvm::error_code make_dynamic_error_code
} // end namespace lld
-namespace llvm {
-
+namespace std {
template <>
struct is_error_code_enum<lld::NativeReaderError> : std::true_type {};
template <> struct is_error_code_enum<lld::YamlReaderError> : std::true_type {};
@@ -104,6 +103,6 @@ template <>
struct is_error_code_enum<lld::LinkerScriptReaderError> : std::true_type {};
template <> struct is_error_code_enum<lld::InputGraphError> : std::true_type {};
template <> struct is_error_code_enum<lld::ReaderError> : std::true_type {};
-} // end namespace llvm
+}
#endif
Modified: lld/trunk/include/lld/Core/LLVM.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/LLVM.h?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/LLVM.h (original)
+++ lld/trunk/include/lld/Core/LLVM.h Wed Jun 11 14:05:58 2014
@@ -38,7 +38,6 @@ namespace llvm {
template<typename T>
class ErrorOr;
- class error_code;
class raw_ostream;
// TODO: DenseMap, ...
}
Modified: lld/trunk/include/lld/Driver/CoreInputGraph.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/CoreInputGraph.h?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/CoreInputGraph.h (original)
+++ lld/trunk/include/lld/Driver/CoreInputGraph.h Wed Jun 11 14:05:58 2014
@@ -34,8 +34,8 @@ public:
/// \brief Parse the input file to lld::File.
error_code parse(const LinkingContext &ctx, raw_ostream &diagnostics) override {
ErrorOr<StringRef> filePath = getPath(ctx);
- if (filePath.getError() == llvm::errc::no_such_file_or_directory)
- return make_error_code(llvm::errc::no_such_file_or_directory);
+ if (filePath.getError() == std::errc::no_such_file_or_directory)
+ return make_error_code(std::errc::no_such_file_or_directory);
// Create a memory buffer
std::unique_ptr<MemoryBuffer> mb;
Modified: lld/trunk/lib/Core/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Error.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/Core/Error.cpp (original)
+++ lld/trunk/lib/Core/Error.cpp Wed Jun 11 14:05:58 2014
@@ -45,7 +45,7 @@ public:
default_error_condition(int ev) const LLVM_NOEXCEPT override {
if (NativeReaderError(ev) == NativeReaderError::success)
return llvm::error_condition();
- return llvm::errc::invalid_argument;
+ return std::errc::invalid_argument;
}
};
@@ -75,7 +75,7 @@ public:
default_error_condition(int ev) const LLVM_NOEXCEPT override {
if (YamlReaderError(ev) == YamlReaderError::success)
return llvm::error_condition();
- return llvm::errc::invalid_argument;
+ return std::errc::invalid_argument;
}
};
@@ -106,7 +106,7 @@ public:
LinkerScriptReaderError e = LinkerScriptReaderError(ev);
if (e == LinkerScriptReaderError::success)
return llvm::error_condition();
- return llvm::errc::invalid_argument;
+ return std::errc::invalid_argument;
}
};
@@ -132,7 +132,7 @@ public:
default_error_condition(int ev) const LLVM_NOEXCEPT override {
if (InputGraphError(ev) == InputGraphError::success)
return llvm::error_condition();
- return llvm::errc::invalid_argument;
+ return std::errc::invalid_argument;
}
};
@@ -161,7 +161,7 @@ public:
default_error_condition(int ev) const LLVM_NOEXCEPT override {
if (ReaderError(ev) == ReaderError::success)
return llvm::error_condition();
- return llvm::errc::invalid_argument;
+ return std::errc::invalid_argument;
}
};
Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Wed Jun 11 14:05:58 2014
@@ -159,7 +159,7 @@ llvm::ErrorOr<StringRef> ELFFileNode::ge
}
std::string ELFFileNode::errStr(error_code errc) {
- if (errc == llvm::errc::no_such_file_or_directory) {
+ if (errc == std::errc::no_such_file_or_directory) {
if (_attributes._isDashlPrefix)
return (Twine("Unable to find library -l") + _path).str();
return (Twine("Unable to find file ") + _path).str();
Modified: lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h Wed Jun 11 14:05:58 2014
@@ -546,7 +546,7 @@ ErrorOr<const lld::AtomLayout &> Default
// undefined atoms can still be included in the output symbol table for
// -noinhibit-exec.
if (definedAtom->contentType() == DefinedAtom::typeUnknown)
- return make_error_code(llvm::errc::invalid_argument);
+ return make_error_code(std::errc::invalid_argument);
const DefinedAtom::ContentPermissions permissions =
definedAtom->permissions();
const DefinedAtom::ContentType contentType = definedAtom->contentType();
Modified: lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp Wed Jun 11 14:05:58 2014
@@ -178,7 +178,7 @@ ErrorOr<StringRef> ELFLinkingContext::se
return StringRef(*new (_allocator) std::string(path.str()));
}
if (!llvm::sys::fs::exists(libName))
- return llvm::make_error_code(llvm::errc::no_such_file_or_directory);
+ return llvm::make_error_code(std::errc::no_such_file_or_directory);
return libName;
}
@@ -195,7 +195,7 @@ ErrorOr<StringRef> ELFLinkingContext::se
return fileName;
if (llvm::sys::path::is_absolute(fileName))
- return llvm::make_error_code(llvm::errc::no_such_file_or_directory);
+ return llvm::make_error_code(std::errc::no_such_file_or_directory);
for (StringRef dir : _inputSearchPaths) {
buildSearchPath(path, dir, _sysrootPath);
@@ -203,7 +203,7 @@ ErrorOr<StringRef> ELFLinkingContext::se
if (llvm::sys::fs::exists(path.str()))
return StringRef(*new (_allocator) std::string(path.str()));
}
- return llvm::make_error_code(llvm::errc::no_such_file_or_directory);
+ return llvm::make_error_code(std::errc::no_such_file_or_directory);
}
void ELFLinkingContext::createInternalFiles(
Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp Wed Jun 11 14:05:58 2014
@@ -65,7 +65,7 @@ forEachLoadCommand(StringRef lcRange, un
slc = &lcCopy;
}
if ( (p + slc->cmdsize) > lcRange.end() )
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
if (func(slc->cmd, slc->cmdsize, p))
return error_code();
@@ -81,7 +81,7 @@ static error_code
appendRelocations(Relocations &relocs, StringRef buffer, bool swap,
bool bigEndian, uint32_t reloff, uint32_t nreloc) {
if ((reloff + nreloc*8) > buffer.size())
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
const any_relocation_info* relocsArray =
reinterpret_cast<const any_relocation_info*>(buffer.begin()+reloff);
@@ -96,9 +96,9 @@ appendIndirectSymbols(IndirectSymbols &i
bool bigEndian, uint32_t istOffset, uint32_t istCount,
uint32_t startIndex, uint32_t count) {
if ((istOffset + istCount*4) > buffer.size())
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
if (startIndex+count > istCount)
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
const uint32_t *indirectSymbolArray =
reinterpret_cast<const uint32_t*>(buffer.begin()+istOffset);
@@ -146,12 +146,12 @@ readBinary(std::unique_ptr<MemoryBuffer>
fa++;
}
if (!foundArch) {
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
}
objSize = readBigEndian(fa->size);
uint32_t offset = readBigEndian(fa->offset);
if ((offset + objSize) > mb->getBufferSize())
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
start += offset;
mh = reinterpret_cast<const mach_header *>(start);
}
@@ -175,7 +175,7 @@ readBinary(std::unique_ptr<MemoryBuffer>
swap = true;
break;
default:
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
}
// Endian swap header, if needed.
@@ -193,7 +193,7 @@ readBinary(std::unique_ptr<MemoryBuffer>
start + (is64 ? sizeof(mach_header_64) : sizeof(mach_header));
StringRef lcRange(lcStart, smh->sizeofcmds);
if (lcRange.end() > (start + objSize))
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
// Normalize architecture
f->arch = MachOLinkingContext::archFromCpuType(smh->cputype, smh->cpusubtype);
Modified: lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp Wed Jun 11 14:05:58 2014
@@ -380,7 +380,7 @@ void MachOFileLayout::buildFileOffsets()
if (&sg1 == &sg2)
continue;
if (overlaps(sg1,sg2)) {
- _ec = llvm::make_error_code(llvm::errc::executable_format_error);
+ _ec = llvm::make_error_code(std::errc::executable_format_error);
return;
}
}
@@ -392,7 +392,7 @@ void MachOFileLayout::buildFileOffsets()
if (&s1 == &s2)
continue;
if (overlaps(s1,s2)) {
- _ec = llvm::make_error_code(llvm::errc::executable_format_error);
+ _ec = llvm::make_error_code(std::errc::executable_format_error);
return;
}
}
@@ -413,7 +413,7 @@ void MachOFileLayout::buildFileOffsets()
if ((s.address >= sg.address)
&& (s.address+s.content.size() <= sg.address+sg.size)) {
if (!sg.name.equals(s.segmentName)) {
- _ec = llvm::make_error_code(llvm::errc::executable_format_error);
+ _ec = llvm::make_error_code(std::errc::executable_format_error);
return;
}
_segInfo[&sg].sections.push_back(&s);
Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp Wed Jun 11 14:05:58 2014
@@ -977,7 +977,7 @@ private:
std::string programPath = llvm::sys::FindProgramByName(program);
if (programPath.empty()) {
llvm::errs() << "Unable to find " << program << " in PATH\n";
- return llvm::errc::broken_pipe;
+ return std::errc::broken_pipe;
}
std::vector<const char *> args;
args.push_back(programPath.c_str());
@@ -996,7 +996,7 @@ private:
if (llvm::sys::ExecuteAndWait(programPath.c_str(), &args[0]) != 0) {
llvm::errs() << program << " failed\n";
- return llvm::errc::broken_pipe;
+ return std::errc::broken_pipe;
}
return outFilePath.str().str();
}
Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.h?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.h (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.h Wed Jun 11 14:05:58 2014
@@ -15,7 +15,6 @@
namespace llvm {
class MemoryBuffer;
-class error_code;
}
namespace lld {
Modified: lld/trunk/lib/ReaderWriter/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Reader.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Reader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Reader.cpp Wed Jun 11 14:05:58 2014
@@ -44,7 +44,7 @@ Registry::parseFile(std::unique_ptr<Memo
return reader->parseFile(mb, *this, result);
// No Reader could parse this file.
- return llvm::make_error_code(llvm::errc::executable_format_error);
+ return llvm::make_error_code(std::errc::executable_format_error);
}
static const Registry::KindStrings kindStrings[] = {
Modified: lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp?rev=210689&r1=210688&r2=210689&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp (original)
+++ lld/trunk/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp Wed Jun 11 14:05:58 2014
@@ -1252,7 +1252,7 @@ public:
std::string errorInfo;
llvm::raw_fd_ostream out(outPath.data(), errorInfo, llvm::sys::fs::F_Text);
if (!errorInfo.empty())
- return llvm::make_error_code(llvm::errc::no_such_file_or_directory);
+ return llvm::make_error_code(std::errc::no_such_file_or_directory);
// Create yaml Output writer, using yaml options for context.
YamlContext yamlContext;
More information about the llvm-commits
mailing list