diff options
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp | 3 | ||||
| -rw-r--r-- | llvm/tools/obj2yaml/Error.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp b/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp index 5b0d21f83db..e07ded95c0f 100644 --- a/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp +++ b/llvm/tools/llvm-pdbutil/llvm-pdbutil.cpp @@ -46,7 +46,6 @@ #include "llvm/DebugInfo/CodeView/StringsAndChecksums.h" #include "llvm/DebugInfo/CodeView/TypeStreamMerger.h" #include "llvm/DebugInfo/MSF/MSFBuilder.h" -#include "llvm/DebugInfo/PDB/GenericError.h" #include "llvm/DebugInfo/PDB/IPDBEnumChildren.h" #include "llvm/DebugInfo/PDB/IPDBInjectedSource.h" #include "llvm/DebugInfo/PDB/IPDBRawSymbol.h" @@ -681,7 +680,7 @@ static void yamlToPdb(StringRef Path) { /*RequiresNullTerminator=*/false); if (ErrorOrBuffer.getError()) { - ExitOnErr(make_error<GenericError>(generic_error_code::invalid_path, Path)); + ExitOnErr(createFileError(Path, errorCodeToError(ErrorOrBuffer.getError()))); } std::unique_ptr<MemoryBuffer> &Buffer = ErrorOrBuffer.get(); diff --git a/llvm/tools/obj2yaml/Error.cpp b/llvm/tools/obj2yaml/Error.cpp index 399b563fd9c..2b6a815fe2f 100644 --- a/llvm/tools/obj2yaml/Error.cpp +++ b/llvm/tools/obj2yaml/Error.cpp @@ -53,7 +53,7 @@ const std::error_category &obj2yaml_category() { char Obj2YamlError::ID = 0; -void Obj2YamlError::log(raw_ostream &OS) const { OS << ErrMsg << "\n"; } +void Obj2YamlError::log(raw_ostream &OS) const { OS << ErrMsg; } std::error_code Obj2YamlError::convertToErrorCode() const { return std::error_code(static_cast<int>(Code), obj2yaml_category()); |
