[llvm] r268791 - Port DebugInfoPDB over to using llvm::Error.
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Fri May 6 13:51:58 PDT 2016
Author: zturner
Date: Fri May 6 15:51:57 2016
New Revision: 268791
URL: http://llvm.org/viewvc/llvm-project?rev=268791&view=rev
Log:
Port DebugInfoPDB over to using llvm::Error.
Differential Revision: http://reviews.llvm.org/D19940
Reviewed By: rnk
Added:
llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIAError.h
llvm/trunk/include/llvm/DebugInfo/PDB/GenericError.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawError.h
llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp
llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp
Modified:
llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASession.h
llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
llvm/trunk/include/llvm/DebugInfo/PDB/PDB.h
llvm/trunk/include/llvm/DebugInfo/PDB/PDBTypes.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/ByteStream.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/InfoStream.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameMap.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/PDBFile.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawSession.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamReader.h
llvm/trunk/include/llvm/DebugInfo/PDB/Raw/TpiStream.h
llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt
llvm/trunk/lib/DebugInfo/PDB/DIA/DIASession.cpp
llvm/trunk/lib/DebugInfo/PDB/PDB.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/ByteStream.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/DbiStream.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/InfoStream.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/MappedBlockStream.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/NameHashTable.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/NameMap.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/PDBFile.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/RawSession.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/StreamReader.cpp
llvm/trunk/lib/DebugInfo/PDB/Raw/TpiStream.cpp
llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp
llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test
llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp
Added: llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIAError.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIAError.h?rev=268791&view=auto
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIAError.h (added)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIAError.h Fri May 6 15:51:57 2016
@@ -0,0 +1,46 @@
+//===- DIAError.h - Error extensions for PDB DIA implementation -*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEBUGINFO_PDB_DIA_DIAERROR_H
+#define LLVM_DEBUGINFO_PDB_DIA_DIAERROR_H
+
+#include "llvm/Support/Error.h"
+
+#include <string>
+
+namespace llvm {
+namespace pdb {
+enum class dia_error_code {
+ unspecified = 1,
+ could_not_create_impl,
+ invalid_file_format,
+ invalid_parameter,
+ already_loaded,
+ debug_info_mismatch,
+};
+
+/// Base class for errors originating in DIA SDK, e.g. COM calls
+class DIAError : public ErrorInfo<DIAError> {
+public:
+ static char ID;
+ DIAError(dia_error_code C);
+ DIAError(const std::string &Context);
+ DIAError(dia_error_code C, const std::string &Context);
+
+ void log(raw_ostream &OS) const override;
+ const std::string &getErrorMessage() const;
+ std::error_code convertToErrorCode() const override;
+
+private:
+ std::string ErrMsg;
+ dia_error_code Code;
+};
+}
+}
+#endif
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASession.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASession.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASession.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASession.h Fri May 6 15:51:57 2016
@@ -12,6 +12,9 @@
#include "DIASupport.h"
#include "llvm/DebugInfo/PDB/IPDBSession.h"
+#include "llvm/Support/Error.h"
+
+#include <system_error>
namespace llvm {
class StringRef;
@@ -21,10 +24,10 @@ class DIASession : public IPDBSession {
public:
explicit DIASession(CComPtr<IDiaSession> DiaSession);
- static PDB_ErrorCode createFromPdb(StringRef Path,
- std::unique_ptr<IPDBSession> &Session);
- static PDB_ErrorCode createFromExe(StringRef Path,
- std::unique_ptr<IPDBSession> &Session);
+ static Error createFromPdb(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session);
+ static Error createFromExe(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session);
uint64_t getLoadAddress() const override;
void setLoadAddress(uint64_t Address) override;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/DIA/DIASupport.h Fri May 6 15:51:57 2016
@@ -22,6 +22,14 @@
#define NOMINMAX
#endif
+// llvm/Support/Debug.h unconditionally #defines DEBUG as a macro.
+// DIA headers #define it if it is not already defined, so we have
+// an order of includes problem. The real fix is to make LLVM use
+// something less generic than DEBUG, such as LLVM_DEBUG(), but it's
+// fairly prevalent. So for now, we save the definition state and
+// restore it.
+#pragma push_macro("DEBUG")
+
// atlbase.h has to come before windows.h
#include <atlbase.h>
#include <windows.h>
@@ -29,5 +37,8 @@
// DIA headers must come after windows headers.
#include <cvconst.h>
#include <dia2.h>
+#include <diacreate.h>
+
+#pragma pop_macro("DEBUG")
#endif // LLVM_DEBUGINFO_PDB_DIA_DIASUPPORT_H
Added: llvm/trunk/include/llvm/DebugInfo/PDB/GenericError.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/GenericError.h?rev=268791&view=auto
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/GenericError.h (added)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/GenericError.h Fri May 6 15:51:57 2016
@@ -0,0 +1,42 @@
+//===- Error.h - system_error extensions for PDB ----------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEBUGINFO_PDB_ERROR_H
+#define LLVM_DEBUGINFO_PDB_ERROR_H
+
+#include "llvm/Support/Error.h"
+
+namespace llvm {
+namespace pdb {
+
+enum class generic_error_code {
+ invalid_path = 1,
+ dia_sdk_not_present,
+ unspecified,
+};
+
+/// Base class for errors originating when parsing raw PDB files
+class GenericError : public ErrorInfo<GenericError> {
+public:
+ static char ID;
+ GenericError(generic_error_code C);
+ GenericError(const std::string &Context);
+ GenericError(generic_error_code C, const std::string &Context);
+
+ void log(raw_ostream &OS) const override;
+ const std::string &getErrorMessage() const;
+ std::error_code convertToErrorCode() const override;
+
+private:
+ std::string ErrMsg;
+ generic_error_code Code;
+};
+}
+}
+#endif
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/PDB.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/PDB.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/PDB.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/PDB.h Fri May 6 15:51:57 2016
@@ -11,18 +11,20 @@
#define LLVM_DEBUGINFO_PDB_PDB_H
#include "PDBTypes.h"
+#include "llvm/Support/Error.h"
#include <memory>
+#include <system_error>
namespace llvm {
class StringRef;
namespace pdb {
-PDB_ErrorCode loadDataForPDB(PDB_ReaderType Type, StringRef Path,
- std::unique_ptr<IPDBSession> &Session);
+Error loadDataForPDB(PDB_ReaderType Type, StringRef Path,
+ std::unique_ptr<IPDBSession> &Session);
-PDB_ErrorCode loadDataForEXE(PDB_ReaderType Type, StringRef Path,
- std::unique_ptr<IPDBSession> &Session);
+Error loadDataForEXE(PDB_ReaderType Type, StringRef Path,
+ std::unique_ptr<IPDBSession> &Session);
}
}
#endif
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/PDBTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/PDBTypes.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/PDBTypes.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/PDBTypes.h Fri May 6 15:51:57 2016
@@ -318,19 +318,6 @@ enum class PDB_RegisterId {
enum class PDB_MemberAccess { Private = 1, Protected = 2, Public = 3 };
-enum class PDB_ErrorCode {
- Success,
- NoDiaSupport,
- CouldNotCreateImpl,
- InvalidPath,
- InvalidFileFormat,
- InvalidParameter,
- AlreadyLoaded,
- UnknownError,
- NoMemory,
- DebugInfoMismatch
-};
-
struct VersionInfo {
uint32_t Major;
uint32_t Minor;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/ByteStream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/ByteStream.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/ByteStream.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/ByteStream.h Fri May 6 15:51:57 2016
@@ -31,13 +31,13 @@ public:
void reset();
void initialize(MutableArrayRef<uint8_t> Bytes);
void initialize(uint32_t Length);
- std::error_code initialize(StreamReader &Reader, uint32_t Length);
+ Error initialize(StreamReader &Reader, uint32_t Length);
- std::error_code readBytes(uint32_t Offset,
- MutableArrayRef<uint8_t> Buffer) const override;
+ Error readBytes(uint32_t Offset,
+ MutableArrayRef<uint8_t> Buffer) const override;
- std::error_code getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
- uint32_t Length) const override;
+ Error getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
+ uint32_t Length) const override;
uint32_t getLength() const override;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/DbiStream.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/DbiStream.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/DbiStream.h Fri May 6 15:51:57 2016
@@ -17,6 +17,7 @@
#include "llvm/DebugInfo/PDB/Raw/NameHashTable.h"
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
#include "llvm/Support/Endian.h"
+#include "llvm/Support/Error.h"
namespace llvm {
namespace pdb {
@@ -28,7 +29,7 @@ class DbiStream {
public:
DbiStream(PDBFile &File);
~DbiStream();
- std::error_code reload();
+ Error reload();
PdbRaw_DbiVer getDbiVersion() const;
uint32_t getAge() const;
@@ -49,7 +50,7 @@ public:
ArrayRef<ModuleInfoEx> modules() const;
private:
- std::error_code initializeFileInfo();
+ Error initializeFileInfo();
PDBFile &Pdb;
MappedBlockStream Stream;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/InfoStream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/InfoStream.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/InfoStream.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/InfoStream.h Fri May 6 15:51:57 2016
@@ -17,6 +17,7 @@
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
#include "llvm/Support/Endian.h"
+#include "llvm/Support/Error.h"
namespace llvm {
namespace pdb {
@@ -24,7 +25,7 @@ class InfoStream {
public:
InfoStream(PDBFile &File);
- std::error_code reload();
+ Error reload();
PdbRaw_ImplVer getVersion() const;
uint32_t getSignature() const;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h Fri May 6 15:51:57 2016
@@ -25,10 +25,10 @@ class MappedBlockStream : public StreamI
public:
MappedBlockStream(uint32_t StreamIdx, const PDBFile &File);
- std::error_code readBytes(uint32_t Offset,
- MutableArrayRef<uint8_t> Buffer) const override;
- std::error_code getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
- uint32_t Length) const override;
+ Error readBytes(uint32_t Offset,
+ MutableArrayRef<uint8_t> Buffer) const override;
+ Error getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
+ uint32_t Length) const override;
uint32_t getLength() const override { return StreamLength; }
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h Fri May 6 15:51:57 2016
@@ -13,6 +13,7 @@
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/DebugInfo/PDB/Raw/ByteStream.h"
+#include "llvm/Support/Error.h"
#include <stdint.h>
#include <utility>
@@ -24,7 +25,7 @@ class NameHashTable {
public:
NameHashTable();
- std::error_code load(StreamReader &Stream);
+ Error load(StreamReader &Stream);
uint32_t getNameCount() const { return NameCount; }
uint32_t getHashVersion() const { return HashVersion; }
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameMap.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameMap.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameMap.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/NameMap.h Fri May 6 15:51:57 2016
@@ -12,6 +12,7 @@
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Error.h"
#include <stdint.h>
#include <utility>
@@ -23,7 +24,7 @@ class NameMap {
public:
NameMap();
- std::error_code load(StreamReader &Stream);
+ Error load(StreamReader &Stream);
bool tryGetValue(StringRef Name, uint32_t &Value) const;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/PDBFile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/PDBFile.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/PDBFile.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/PDBFile.h Fri May 6 15:51:57 2016
@@ -12,6 +12,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/Support/Endian.h"
+#include "llvm/Support/Error.h"
#include "llvm/Support/MathExtras.h"
#include <memory>
@@ -47,8 +48,8 @@ public:
ArrayRef<support::ulittle32_t> getDirectoryBlockArray();
- std::error_code parseFileHeaders();
- std::error_code parseStreamData();
+ Error parseFileHeaders();
+ Error parseStreamData();
static uint64_t bytesToBlocks(uint64_t NumBytes, uint64_t BlockSize) {
return alignTo(NumBytes, BlockSize) / BlockSize;
@@ -58,9 +59,9 @@ public:
return BlockNumber * BlockSize;
}
- InfoStream &getPDBInfoStream();
- DbiStream &getPDBDbiStream();
- TpiStream &getPDBTpiStream();
+ Expected<InfoStream &> getPDBInfoStream();
+ Expected<DbiStream &> getPDBDbiStream();
+ Expected<TpiStream &> getPDBTpiStream();
private:
std::unique_ptr<PDBFileContext> Context;
Added: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawError.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawError.h?rev=268791&view=auto
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawError.h (added)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawError.h Fri May 6 15:51:57 2016
@@ -0,0 +1,44 @@
+//===- RawError.h - Error extensions for raw PDB implementation -*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEBUGINFO_PDB_RAW_RAWERROR_H
+#define LLVM_DEBUGINFO_PDB_RAW_RAWERROR_H
+
+#include "llvm/Support/Error.h"
+
+#include <string>
+
+namespace llvm {
+namespace pdb {
+enum class raw_error_code {
+ unspecified = 1,
+ feature_unsupported,
+ corrupt_file,
+ insufficient_buffer,
+};
+
+/// Base class for errors originating when parsing raw PDB files
+class RawError : public ErrorInfo<RawError> {
+public:
+ static char ID;
+ RawError(raw_error_code C);
+ RawError(const std::string &Context);
+ RawError(raw_error_code C, const std::string &Context);
+
+ void log(raw_ostream &OS) const override;
+ const std::string &getErrorMessage() const;
+ std::error_code convertToErrorCode() const override;
+
+private:
+ std::string ErrMsg;
+ raw_error_code Code;
+};
+}
+}
+#endif
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawSession.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawSession.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawSession.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/RawSession.h Fri May 6 15:51:57 2016
@@ -12,6 +12,7 @@
#include "llvm/ADT/StringRef.h"
#include "llvm/DebugInfo/PDB/IPDBSession.h"
+#include "llvm/Support/Error.h"
namespace llvm {
namespace pdb {
@@ -22,10 +23,10 @@ public:
explicit RawSession(std::unique_ptr<PDBFile> PdbFile);
~RawSession() override;
- static PDB_ErrorCode createFromPdb(StringRef Path,
- std::unique_ptr<IPDBSession> &Session);
- static PDB_ErrorCode createFromExe(StringRef Path,
- std::unique_ptr<IPDBSession> &Session);
+ static Error createFromPdb(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session);
+ static Error createFromExe(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session);
uint64_t getLoadAddress() const override;
void setLoadAddress(uint64_t Address) override;
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h Fri May 6 15:51:57 2016
@@ -11,9 +11,9 @@
#define LLVM_DEBUGINFO_PDB_RAW_STREAMINTERFACE_H
#include "llvm/ADT/ArrayRef.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include <stdint.h>
-#include <system_error>
namespace llvm {
namespace pdb {
@@ -21,11 +21,10 @@ class StreamInterface {
public:
virtual ~StreamInterface() {}
- virtual std::error_code readBytes(uint32_t Offset,
- MutableArrayRef<uint8_t> Buffer) const = 0;
- virtual std::error_code getArrayRef(uint32_t Offset,
- ArrayRef<uint8_t> &Buffer,
- uint32_t Length) const = 0;
+ virtual Error readBytes(uint32_t Offset,
+ MutableArrayRef<uint8_t> Buffer) const = 0;
+ virtual Error getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
+ uint32_t Length) const = 0;
virtual uint32_t getLength() const = 0;
};
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamReader.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamReader.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/StreamReader.h Fri May 6 15:51:57 2016
@@ -13,9 +13,9 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/DebugInfo/PDB/Raw/StreamInterface.h"
#include "llvm/Support/Endian.h"
+#include "llvm/Support/Error.h"
#include <string>
-#include <system_error>
namespace llvm {
namespace pdb {
@@ -24,22 +24,22 @@ class StreamReader {
public:
StreamReader(const StreamInterface &S);
- std::error_code readBytes(MutableArrayRef<uint8_t> Buffer);
- std::error_code readInteger(uint32_t &Dest);
- std::error_code readZeroString(std::string &Dest);
+ Error readBytes(MutableArrayRef<uint8_t> Buffer);
+ Error readInteger(uint32_t &Dest);
+ Error readZeroString(std::string &Dest);
- template <typename T> std::error_code readObject(T *Dest) {
+ template <typename T> Error readObject(T *Dest) {
MutableArrayRef<uint8_t> Buffer(reinterpret_cast<uint8_t *>(Dest),
sizeof(T));
return readBytes(Buffer);
}
- template <typename T> std::error_code readArray(MutableArrayRef<T> Array) {
+ template <typename T> Error readArray(MutableArrayRef<T> Array) {
MutableArrayRef<uint8_t> Casted(reinterpret_cast<uint8_t*>(Array.data()), Array.size() * sizeof(T));
return readBytes(Casted);
}
- std::error_code getArrayRef(ArrayRef<uint8_t> &Array, uint32_t Length);
+ Error getArrayRef(ArrayRef<uint8_t> &Array, uint32_t Length);
void setOffset(uint32_t Off) { Offset = Off; }
uint32_t getOffset() const { return Offset; }
Modified: llvm/trunk/include/llvm/DebugInfo/PDB/Raw/TpiStream.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/Raw/TpiStream.h?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/Raw/TpiStream.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/Raw/TpiStream.h Fri May 6 15:51:57 2016
@@ -16,6 +16,8 @@
#include "llvm/DebugInfo/PDB/Raw/MappedBlockStream.h"
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
+#include "llvm/Support/Error.h"
+
namespace llvm {
namespace pdb {
class PDBFile;
@@ -28,7 +30,7 @@ class TpiStream {
public:
TpiStream(PDBFile &File);
~TpiStream();
- std::error_code reload();
+ Error reload();
PdbRaw_TpiVer getTpiVersion() const;
Modified: llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt (original)
+++ llvm/trunk/lib/DebugInfo/PDB/CMakeLists.txt Fri May 6 15:51:57 2016
@@ -17,6 +17,7 @@ if(HAVE_DIA_SDK)
DIA/DIAEnumLineNumbers.cpp
DIA/DIAEnumSourceFiles.cpp
DIA/DIAEnumSymbols.cpp
+ DIA/DIAError.cpp
DIA/DIALineNumber.cpp
DIA/DIARawSymbol.cpp
DIA/DIASession.cpp
@@ -35,6 +36,7 @@ add_pdb_impl_folder(Raw
Raw/InfoStream.cpp
Raw/NameHashTable.cpp
Raw/NameMap.cpp
+ Raw/RawError.cpp
Raw/RawSession.cpp
Raw/StreamReader.cpp
Raw/TpiStream.cpp)
@@ -42,6 +44,7 @@ add_pdb_impl_folder(Raw
list(APPEND LIBPDB_ADDITIONAL_HEADER_DIRS "${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/PDB")
add_llvm_library(LLVMDebugInfoPDB
+ GenericError.cpp
IPDBSourceFile.cpp
PDB.cpp
PDBContext.cpp
Added: llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp?rev=268791&view=auto
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp (added)
+++ llvm/trunk/lib/DebugInfo/PDB/DIA/DIAError.cpp Fri May 6 15:51:57 2016
@@ -0,0 +1,56 @@
+#include "llvm/DebugInfo/PDB/DIA/DIAError.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
+
+using namespace llvm;
+using namespace llvm::pdb;
+
+class DIAErrorCategory : public std::error_category {
+public:
+ const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb.dia"; }
+
+ std::string message(int Condition) const override {
+ switch (static_cast<dia_error_code>(Condition)) {
+ case dia_error_code::could_not_create_impl:
+ return "Failed to connect to DIA at runtime. Verify that Visual Studio "
+ "is properly installed, or that msdiaXX.dll is in your PATH.";
+ case dia_error_code::invalid_file_format:
+ return "Unable to load PDB. The file has an unrecognized format.";
+ case dia_error_code::invalid_parameter:
+ return "The parameter is incorrect.";
+ case dia_error_code::already_loaded:
+ return "Unable to load the PDB or EXE, because it is already loaded.";
+ case dia_error_code::debug_info_mismatch:
+ return "The PDB file and the EXE file do not match.";
+ case dia_error_code::unspecified:
+ return "An unknown error has occurred.";
+ }
+ llvm_unreachable("Unrecognized DIAErrorCode");
+ }
+};
+
+static ManagedStatic<DIAErrorCategory> Category;
+
+char DIAError::ID = 0;
+
+DIAError::DIAError(dia_error_code C) : DIAError(C, "") {}
+
+DIAError::DIAError(const std::string &Context)
+ : DIAError(dia_error_code::unspecified, Context) {}
+
+DIAError::DIAError(dia_error_code C, const std::string &Context) : Code(C) {
+ ErrMsg = "DIA Error: ";
+ std::error_code EC = convertToErrorCode();
+ if (Code != dia_error_code::unspecified)
+ ErrMsg += EC.message() + " ";
+ if (!Context.empty())
+ ErrMsg += Context;
+}
+
+void DIAError::log(raw_ostream &OS) const { OS << ErrMsg << "\n"; }
+
+const std::string &DIAError::getErrorMessage() const { return ErrMsg; }
+
+std::error_code DIAError::convertToErrorCode() const {
+ return std::error_code(static_cast<int>(Code), *Category);
+}
Modified: llvm/trunk/lib/DebugInfo/PDB/DIA/DIASession.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/DIA/DIASession.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/DIA/DIASession.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/DIA/DIASession.cpp Fri May 6 15:51:57 2016
@@ -6,35 +6,55 @@
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
-
+#include "llvm/DebugInfo/PDB/DIA/DIASession.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h"
#include "llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h"
#include "llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h"
+#include "llvm/DebugInfo/PDB/DIA/DIAError.h"
#include "llvm/DebugInfo/PDB/DIA/DIARawSymbol.h"
-#include "llvm/DebugInfo/PDB/DIA/DIASession.h"
#include "llvm/DebugInfo/PDB/DIA/DIASourceFile.h"
+#include "llvm/DebugInfo/PDB/DIA/DIASupport.h"
+#include "llvm/DebugInfo/PDB/GenericError.h"
+#include "llvm/DebugInfo/PDB/PDB.h"
#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
#include "llvm/Support/ConvertUTF.h"
-#include <diacreate.h>
-
using namespace llvm;
using namespace llvm::pdb;
namespace {
-PDB_ErrorCode LoadDIA(CComPtr<IDiaDataSource> &DiaDataSource) {
+Error ErrorFromHResult(HRESULT Result) {
+ switch (Result) {
+ case E_PDB_NOT_FOUND:
+ return make_error<GenericError>(generic_error_code::invalid_path);
+ case E_PDB_FORMAT:
+ return make_error<DIAError>(dia_error_code::invalid_file_format);
+ case E_INVALIDARG:
+ return make_error<DIAError>(dia_error_code::invalid_parameter);
+ case E_UNEXPECTED:
+ return make_error<DIAError>(dia_error_code::already_loaded);
+ case E_PDB_INVALID_SIG:
+ case E_PDB_INVALID_AGE:
+ return make_error<DIAError>(dia_error_code::debug_info_mismatch);
+ default:
+ return make_error<DIAError>(dia_error_code::unspecified);
+ }
+}
+
+Error LoadDIA(CComPtr<IDiaDataSource> &DiaDataSource) {
if (SUCCEEDED(CoCreateInstance(CLSID_DiaSource, nullptr, CLSCTX_INPROC_SERVER,
IID_IDiaDataSource,
reinterpret_cast<LPVOID *>(&DiaDataSource))))
- return PDB_ErrorCode::Success;
+ return Error::success();
- // If the CoCreateInstance call above failed, msdia*.dll is not registered.
- // Try loading the DLL corresponding to the #included DIA SDK.
+// If the CoCreateInstance call above failed, msdia*.dll is not registered.
+// Try loading the DLL corresponding to the #included DIA SDK.
#if !defined(_MSC_VER)
- return PDB_ErrorCode::NoDiaSupport;
+ return llvm::make_error<GenericError>(
+ "DIA is only supported when using MSVC.");
#endif
const wchar_t *msdia_dll = nullptr;
@@ -46,98 +66,65 @@ PDB_ErrorCode LoadDIA(CComPtr<IDiaDataSo
#error "Unknown Visual Studio version."
#endif
- if (SUCCEEDED(NoRegCoCreate(msdia_dll, CLSID_DiaSource, IID_IDiaDataSource,
- reinterpret_cast<LPVOID *>(&DiaDataSource))))
- return PDB_ErrorCode::Success;
- else
- return PDB_ErrorCode::CouldNotCreateImpl;
+ HRESULT HR;
+ if (FAILED(HR = NoRegCoCreate(msdia_dll, CLSID_DiaSource, IID_IDiaDataSource,
+ reinterpret_cast<LPVOID *>(&DiaDataSource))))
+ return ErrorFromHResult(HR);
+ return Error::success();
}
}
DIASession::DIASession(CComPtr<IDiaSession> DiaSession) : Session(DiaSession) {}
-PDB_ErrorCode DIASession::createFromPdb(StringRef Path,
- std::unique_ptr<IPDBSession> &Session) {
+Error DIASession::createFromPdb(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session) {
CComPtr<IDiaDataSource> DiaDataSource;
CComPtr<IDiaSession> DiaSession;
// We assume that CoInitializeEx has already been called by the executable.
- PDB_ErrorCode result = LoadDIA(DiaDataSource);
- if (result != PDB_ErrorCode::Success)
- return result;
+ if (auto E = LoadDIA(DiaDataSource))
+ return E;
llvm::SmallVector<UTF16, 128> Path16;
if (!llvm::convertUTF8ToUTF16String(Path, Path16))
- return PDB_ErrorCode::InvalidPath;
+ return make_error<GenericError>(generic_error_code::invalid_path);
const wchar_t *Path16Str = reinterpret_cast<const wchar_t*>(Path16.data());
- HRESULT Result;
- if (FAILED(Result = DiaDataSource->loadDataFromPdb(Path16Str))) {
- if (Result == E_PDB_NOT_FOUND)
- return PDB_ErrorCode::InvalidPath;
- else if (Result == E_PDB_FORMAT)
- return PDB_ErrorCode::InvalidFileFormat;
- else if (Result == E_INVALIDARG)
- return PDB_ErrorCode::InvalidParameter;
- else if (Result == E_UNEXPECTED)
- return PDB_ErrorCode::AlreadyLoaded;
- else
- return PDB_ErrorCode::UnknownError;
- }
+ HRESULT HR;
+ if (FAILED(HR = DiaDataSource->loadDataFromPdb(Path16Str)))
+ return ErrorFromHResult(HR);
- if (FAILED(Result = DiaDataSource->openSession(&DiaSession))) {
- if (Result == E_OUTOFMEMORY)
- return PDB_ErrorCode::NoMemory;
- else
- return PDB_ErrorCode::UnknownError;
- }
+ if (FAILED(HR = DiaDataSource->openSession(&DiaSession)))
+ return ErrorFromHResult(HR);
Session.reset(new DIASession(DiaSession));
- return PDB_ErrorCode::Success;
+ return Error::success();
}
-PDB_ErrorCode DIASession::createFromExe(StringRef Path,
- std::unique_ptr<IPDBSession> &Session) {
+Error DIASession::createFromExe(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session) {
CComPtr<IDiaDataSource> DiaDataSource;
CComPtr<IDiaSession> DiaSession;
// We assume that CoInitializeEx has already been called by the executable.
- PDB_ErrorCode result = LoadDIA(DiaDataSource);
- if (result != PDB_ErrorCode::Success)
- return result;
+ if (auto EC = LoadDIA(DiaDataSource))
+ return EC;
llvm::SmallVector<UTF16, 128> Path16;
if (!llvm::convertUTF8ToUTF16String(Path, Path16))
- return PDB_ErrorCode::InvalidPath;
+ return make_error<GenericError>(generic_error_code::invalid_path, Path);
const wchar_t *Path16Str = reinterpret_cast<const wchar_t *>(Path16.data());
- HRESULT Result;
- if (FAILED(Result =
- DiaDataSource->loadDataForExe(Path16Str, nullptr, nullptr))) {
- if (Result == E_PDB_NOT_FOUND)
- return PDB_ErrorCode::InvalidPath;
- else if (Result == E_PDB_FORMAT)
- return PDB_ErrorCode::InvalidFileFormat;
- else if (Result == E_PDB_INVALID_SIG || Result == E_PDB_INVALID_AGE)
- return PDB_ErrorCode::DebugInfoMismatch;
- else if (Result == E_INVALIDARG)
- return PDB_ErrorCode::InvalidParameter;
- else if (Result == E_UNEXPECTED)
- return PDB_ErrorCode::AlreadyLoaded;
- else
- return PDB_ErrorCode::UnknownError;
- }
+ HRESULT HR;
+ if (FAILED(HR = DiaDataSource->loadDataForExe(Path16Str, nullptr, nullptr)))
+ return ErrorFromHResult(HR);
- if (FAILED(Result = DiaDataSource->openSession(&DiaSession))) {
- if (Result == E_OUTOFMEMORY)
- return PDB_ErrorCode::NoMemory;
- else
- return PDB_ErrorCode::UnknownError;
- }
+ if (FAILED(HR = DiaDataSource->openSession(&DiaSession)))
+ return ErrorFromHResult(HR);
Session.reset(new DIASession(DiaSession));
- return PDB_ErrorCode::Success;
+ return Error::success();
}
uint64_t DIASession::getLoadAddress() const {
Added: llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp?rev=268791&view=auto
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp (added)
+++ llvm/trunk/lib/DebugInfo/PDB/GenericError.cpp Fri May 6 15:51:57 2016
@@ -0,0 +1,62 @@
+//===- Error.cpp - system_error extensions for PDB --------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/DebugInfo/PDB/GenericError.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
+
+using namespace llvm;
+using namespace llvm::pdb;
+
+class GenericErrorCategory : public std::error_category {
+public:
+ const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb"; }
+
+ std::string message(int Condition) const override {
+ switch (static_cast<generic_error_code>(Condition)) {
+ case generic_error_code::unspecified:
+ return "An unknown error has occurred.";
+ case generic_error_code::dia_sdk_not_present:
+ return "LLVM was not compiled with support for DIA. This usually means "
+ "that you are are not using MSVC, or your Visual Studio "
+ "installation "
+ "is corrupt.";
+ case generic_error_code::invalid_path:
+ return "Unable to load PDB. Make sure the file exists and is readable.";
+ }
+ llvm_unreachable("Unrecognized generic_error_code");
+ }
+};
+
+static ManagedStatic<GenericErrorCategory> Category;
+
+char GenericError::ID = 0;
+
+GenericError::GenericError(generic_error_code C) : GenericError(C, "") {}
+
+GenericError::GenericError(const std::string &Context)
+ : GenericError(generic_error_code::unspecified, Context) {}
+
+GenericError::GenericError(generic_error_code C, const std::string &Context)
+ : Code(C) {
+ ErrMsg = "PDB Error: ";
+ std::error_code EC = convertToErrorCode();
+ if (Code != generic_error_code::unspecified)
+ ErrMsg += EC.message() + " ";
+ if (!Context.empty())
+ ErrMsg += Context;
+}
+
+void GenericError::log(raw_ostream &OS) const { OS << ErrMsg << "\n"; }
+
+const std::string &GenericError::getErrorMessage() const { return ErrMsg; }
+
+std::error_code GenericError::convertToErrorCode() const {
+ return std::error_code(static_cast<int>(Code), *Category);
+}
Modified: llvm/trunk/lib/DebugInfo/PDB/PDB.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/PDB.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/PDB.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/PDB.cpp Fri May 6 15:51:57 2016
@@ -13,17 +13,18 @@
#include "llvm/Config/config.h"
#include "llvm/DebugInfo/PDB/IPDBSession.h"
#include "llvm/DebugInfo/PDB/PDB.h"
-
#if HAVE_DIA_SDK
#include "llvm/DebugInfo/PDB/DIA/DIASession.h"
#endif
#include "llvm/DebugInfo/PDB/Raw/RawSession.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
using namespace llvm;
using namespace llvm::pdb;
-PDB_ErrorCode llvm::pdb::loadDataForPDB(PDB_ReaderType Type, StringRef Path,
- std::unique_ptr<IPDBSession> &Session) {
+Error llvm::pdb::loadDataForPDB(PDB_ReaderType Type, StringRef Path,
+ std::unique_ptr<IPDBSession> &Session) {
// Create the correct concrete instance type based on the value of Type.
if (Type == PDB_ReaderType::Raw)
return RawSession::createFromPdb(Path, Session);
@@ -31,12 +32,12 @@ PDB_ErrorCode llvm::pdb::loadDataForPDB(
#if HAVE_DIA_SDK
return DIASession::createFromPdb(Path, Session);
#else
- return PDB_ErrorCode::NoDiaSupport;
+ return llvm::make_error<GenericError>("DIA is not installed on the system");
#endif
}
-PDB_ErrorCode llvm::pdb::loadDataForEXE(PDB_ReaderType Type, StringRef Path,
- std::unique_ptr<IPDBSession> &Session) {
+Error llvm::pdb::loadDataForEXE(PDB_ReaderType Type, StringRef Path,
+ std::unique_ptr<IPDBSession> &Session) {
// Create the correct concrete instance type based on the value of Type.
if (Type == PDB_ReaderType::Raw)
return RawSession::createFromExe(Path, Session);
@@ -44,6 +45,6 @@ PDB_ErrorCode llvm::pdb::loadDataForEXE(
#if HAVE_DIA_SDK
return DIASession::createFromExe(Path, Session);
#else
- return PDB_ErrorCode::NoDiaSupport;
+ return llvm::make_error<GenericError>("DIA is not installed on the system");
#endif
}
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/ByteStream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/ByteStream.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/ByteStream.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/ByteStream.cpp Fri May 6 15:51:57 2016
@@ -42,29 +42,28 @@ void ByteStream::initialize(uint32_t Len
Owned = true;
}
-std::error_code ByteStream::initialize(StreamReader &Reader, uint32_t Length) {
+Error ByteStream::initialize(StreamReader &Reader, uint32_t Length) {
initialize(Length);
- std::error_code EC = Reader.readBytes(Data);
+ auto EC = Reader.readBytes(Data);
if (EC)
reset();
return EC;
}
-std::error_code ByteStream::readBytes(uint32_t Offset,
- MutableArrayRef<uint8_t> Buffer) const {
+Error ByteStream::readBytes(uint32_t Offset,
+ MutableArrayRef<uint8_t> Buffer) const {
if (Data.size() < Buffer.size() + Offset)
- return std::make_error_code(std::errc::bad_address);
+ return make_error<RawError>(raw_error_code::insufficient_buffer);
::memcpy(Buffer.data(), Data.data() + Offset, Buffer.size());
- return std::error_code();
+ return Error::success();
}
-std::error_code ByteStream::getArrayRef(uint32_t Offset,
- ArrayRef<uint8_t> &Buffer,
- uint32_t Length) const {
+Error ByteStream::getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
+ uint32_t Length) const {
if (Data.size() < Length + Offset)
- return std::make_error_code(std::errc::bad_address);
+ return make_error<RawError>(raw_error_code::insufficient_buffer);
Buffer = Data.slice(Offset, Length);
- return std::error_code();
+ return Error::success();
}
uint32_t ByteStream::getLength() const { return Data.size(); }
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/DbiStream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/DbiStream.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/DbiStream.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/DbiStream.cpp Fri May 6 15:51:57 2016
@@ -8,11 +8,13 @@
//===----------------------------------------------------------------------===//
#include "llvm/DebugInfo/PDB/Raw/DbiStream.h"
+
#include "llvm/DebugInfo/PDB/Raw/InfoStream.h"
#include "llvm/DebugInfo/PDB/Raw/ModInfo.h"
#include "llvm/DebugInfo/PDB/Raw/NameHashTable.h"
#include "llvm/DebugInfo/PDB/Raw/PDBFile.h"
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
using namespace llvm;
@@ -77,49 +79,66 @@ DbiStream::DbiStream(PDBFile &File) : Pd
DbiStream::~DbiStream() {}
-std::error_code DbiStream::reload() {
+Error DbiStream::reload() {
StreamReader Reader(Stream);
Header.reset(new HeaderInfo());
if (Stream.getLength() < sizeof(HeaderInfo))
- return std::make_error_code(std::errc::illegal_byte_sequence);
- Reader.readObject(Header.get());
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI Stream does not contain a header.");
+ if (auto EC = Reader.readObject(Header.get()))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI Stream does not contain a header.");
if (Header->VersionSignature != -1)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Invalid DBI version signature.");
// Require at least version 7, which should be present in all PDBs
// produced in the last decade and allows us to avoid having to
// special case all kinds of complicated arcane formats.
if (Header->VersionHeader < PdbDbiV70)
- return std::make_error_code(std::errc::not_supported);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Unsupported DBI version.");
+
+ auto InfoStream = Pdb.getPDBInfoStream();
+ if (auto EC = InfoStream.takeError())
+ return EC;
- if (Header->Age != Pdb.getPDBInfoStream().getAge())
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ if (Header->Age != InfoStream.get().getAge())
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI Age does not match PDB Age.");
if (Stream.getLength() !=
sizeof(HeaderInfo) + Header->ModiSubstreamSize +
Header->SecContrSubstreamSize + Header->SectionMapSize +
Header->FileInfoSize + Header->TypeServerSize +
Header->OptionalDbgHdrSize + Header->ECSubstreamSize)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI Length does not equal sum of substreams.");
// Only certain substreams are guaranteed to be aligned. Validate
// them here.
if (Header->ModiSubstreamSize % sizeof(uint32_t) != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI MODI substream not aligned.");
if (Header->SecContrSubstreamSize % sizeof(uint32_t) != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(
+ raw_error_code::corrupt_file,
+ "DBI section contribution substream not aligned.");
if (Header->SectionMapSize % sizeof(uint32_t) != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI section map substream not aligned.");
if (Header->FileInfoSize % sizeof(uint32_t) != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI file info substream not aligned.");
if (Header->TypeServerSize % sizeof(uint32_t) != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "DBI type server substream not aligned.");
- std::error_code EC;
- ModInfoSubstream.initialize(Reader, Header->ModiSubstreamSize);
+ if (auto EC = ModInfoSubstream.initialize(Reader, Header->ModiSubstreamSize))
+ return EC;
// Since each ModInfo in the stream is a variable length, we have to iterate
// them to know how many there actually are.
@@ -129,30 +148,33 @@ std::error_code DbiStream::reload() {
for (auto Info : Range)
ModuleInfos.push_back(ModuleInfoEx(Info));
- if ((EC =
- SecContrSubstream.initialize(Reader, Header->SecContrSubstreamSize)))
+ if (auto EC =
+ SecContrSubstream.initialize(Reader, Header->SecContrSubstreamSize))
return EC;
- if ((EC = SecMapSubstream.initialize(Reader, Header->SectionMapSize)))
+ if (auto EC = SecMapSubstream.initialize(Reader, Header->SectionMapSize))
return EC;
- if ((EC = FileInfoSubstream.initialize(Reader, Header->FileInfoSize)))
+ if (auto EC = FileInfoSubstream.initialize(Reader, Header->FileInfoSize))
return EC;
- if ((EC = TypeServerMapSubstream.initialize(Reader, Header->TypeServerSize)))
+ if (auto EC =
+ TypeServerMapSubstream.initialize(Reader, Header->TypeServerSize))
return EC;
- if ((EC = ECSubstream.initialize(Reader, Header->ECSubstreamSize)))
+ if (auto EC = ECSubstream.initialize(Reader, Header->ECSubstreamSize))
return EC;
- if ((EC = DbgHeader.initialize(Reader, Header->OptionalDbgHdrSize)))
+ if (auto EC = DbgHeader.initialize(Reader, Header->OptionalDbgHdrSize))
return EC;
- if ((EC = initializeFileInfo()))
+ if (auto EC = initializeFileInfo())
return EC;
if (Reader.bytesRemaining() > 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Found unexpected bytes in DBI Stream.");
StreamReader ECReader(ECSubstream);
- ECNames.load(ECReader);
+ if (auto EC = ECNames.load(ECReader))
+ return EC;
- return std::error_code();
+ return Error::success();
}
PdbRaw_DbiVer DbiStream::getDbiVersion() const {
@@ -193,7 +215,7 @@ PDB_Machine DbiStream::getMachineType()
ArrayRef<ModuleInfoEx> DbiStream::modules() const { return ModuleInfos; }
-std::error_code DbiStream::initializeFileInfo() {
+Error DbiStream::initializeFileInfo() {
struct FileInfoSubstreamHeader {
ulittle16_t NumModules; // Total # of modules, should match number of
// records in the ModuleInfo substream.
@@ -221,7 +243,8 @@ std::error_code DbiStream::initializeFil
// The number of modules in the stream should be the same as reported by
// the FileInfoSubstreamHeader.
if (FI->NumModules != ModuleInfos.size())
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "FileInfo substream count doesn't match DBI.");
// First is an array of `NumModules` module indices. This is not used for the
// same reason that `NumSourceFiles` is not used. It's an array of uint16's,
@@ -267,5 +290,5 @@ std::error_code DbiStream::initializeFil
}
}
- return std::error_code();
+ return Error::success();
}
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/InfoStream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/InfoStream.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/InfoStream.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/InfoStream.cpp Fri May 6 15:51:57 2016
@@ -11,6 +11,7 @@
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
using namespace llvm;
@@ -18,7 +19,7 @@ using namespace llvm::pdb;
InfoStream::InfoStream(PDBFile &File) : Pdb(File), Stream(StreamPDB, File) {}
-std::error_code InfoStream::reload() {
+Error InfoStream::reload() {
StreamReader Reader(Stream);
struct Header {
@@ -29,19 +30,20 @@ std::error_code InfoStream::reload() {
};
Header H;
- Reader.readObject(&H);
+ if (auto EC = Reader.readObject(&H))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "PDB Stream does not contain a header.");
if (H.Version < PdbRaw_ImplVer::PdbImplVC70)
- return std::make_error_code(std::errc::not_supported);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Unsupported PDB stream version.");
Version = H.Version;
Signature = H.Signature;
Age = H.Age;
Guid = H.Guid;
- NamedStreams.load(Reader);
-
- return std::error_code();
+ return NamedStreams.load(Reader);
}
uint32_t InfoStream::getNamedStreamIndex(llvm::StringRef Name) const {
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/MappedBlockStream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/MappedBlockStream.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/MappedBlockStream.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/MappedBlockStream.cpp Fri May 6 15:51:57 2016
@@ -9,6 +9,7 @@
#include "llvm/DebugInfo/PDB/Raw/MappedBlockStream.h"
#include "llvm/DebugInfo/PDB/Raw/PDBFile.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
using namespace llvm;
using namespace llvm::pdb;
@@ -18,17 +19,16 @@ MappedBlockStream::MappedBlockStream(uin
BlockList = Pdb.getStreamBlockList(StreamIdx);
}
-std::error_code
-MappedBlockStream::readBytes(uint32_t Offset,
- MutableArrayRef<uint8_t> Buffer) const {
+Error MappedBlockStream::readBytes(uint32_t Offset,
+ MutableArrayRef<uint8_t> Buffer) const {
uint32_t BlockNum = Offset / Pdb.getBlockSize();
uint32_t OffsetInBlock = Offset % Pdb.getBlockSize();
// Make sure we aren't trying to read beyond the end of the stream.
if (Buffer.size() > StreamLength)
- return std::make_error_code(std::errc::bad_address);
+ return make_error<RawError>(raw_error_code::insufficient_buffer);
if (Offset > StreamLength - Buffer.size())
- return std::make_error_code(std::errc::bad_address);
+ return make_error<RawError>(raw_error_code::insufficient_buffer);
uint32_t BytesLeft = Buffer.size();
uint32_t BytesWritten = 0;
@@ -49,11 +49,10 @@ MappedBlockStream::readBytes(uint32_t Of
OffsetInBlock = 0;
}
- return std::error_code();
+ return Error::success();
}
-std::error_code MappedBlockStream::getArrayRef(uint32_t Offset,
- ArrayRef<uint8_t> &Buffer,
- uint32_t Length) const {
- return std::make_error_code(std::errc::not_supported);
+Error MappedBlockStream::getArrayRef(uint32_t Offset, ArrayRef<uint8_t> &Buffer,
+ uint32_t Length) const {
+ return make_error<RawError>(raw_error_code::feature_unsupported);
}
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/NameHashTable.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/NameHashTable.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/NameHashTable.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/NameHashTable.cpp Fri May 6 15:51:57 2016
@@ -11,6 +11,7 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/DebugInfo/PDB/Raw/ByteStream.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
#include "llvm/Support/Endian.h"
@@ -18,9 +19,6 @@ using namespace llvm;
using namespace llvm::support;
using namespace llvm::pdb;
-typedef uint32_t *PUL;
-typedef uint16_t *PUS;
-
static inline uint32_t HashStringV1(StringRef Str) {
uint32_t Result = 0;
uint32_t Size = Str.size();
@@ -80,7 +78,7 @@ static inline uint32_t HashStringV2(Stri
NameHashTable::NameHashTable() : Signature(0), HashVersion(0), NameCount(0) {}
-std::error_code NameHashTable::load(StreamReader &Stream) {
+Error NameHashTable::load(StreamReader &Stream) {
struct Header {
support::ulittle32_t Signature;
support::ulittle32_t HashVersion;
@@ -88,27 +86,39 @@ std::error_code NameHashTable::load(Stre
};
Header H;
- Stream.readObject(&H);
+ if (auto EC = Stream.readObject(&H))
+ return EC;
+
if (H.Signature != 0xEFFEEFFE)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Invalid hash table signature");
if (H.HashVersion != 1 && H.HashVersion != 2)
- return std::make_error_code(std::errc::not_supported);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Unsupported hash version");
Signature = H.Signature;
HashVersion = H.HashVersion;
- NamesBuffer.initialize(Stream, H.ByteSize);
+ if (auto EC = NamesBuffer.initialize(Stream, H.ByteSize))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Invalid hash table byte length");
support::ulittle32_t HashCount;
- Stream.readObject(&HashCount);
+ if (auto EC = Stream.readObject(&HashCount))
+ return EC;
+
std::vector<support::ulittle32_t> BucketArray(HashCount);
- Stream.readArray<support::ulittle32_t>(BucketArray);
+ if (auto EC = Stream.readArray<support::ulittle32_t>(BucketArray))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Could not read bucket array");
IDs.assign(BucketArray.begin(), BucketArray.end());
if (Stream.bytesRemaining() < sizeof(support::ulittle32_t))
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Missing name count");
- Stream.readInteger(NameCount);
- return std::error_code();
+ if (auto EC = Stream.readInteger(NameCount))
+ return EC;
+ return Error::success();
}
StringRef NameHashTable::getStringForID(uint32_t ID) const {
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/NameMap.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/NameMap.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/NameMap.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/NameMap.cpp Fri May 6 15:51:57 2016
@@ -9,6 +9,7 @@
#include "llvm/DebugInfo/PDB/Raw/NameMap.h"
#include "llvm/ADT/BitVector.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
using namespace llvm;
@@ -16,12 +17,17 @@ using namespace llvm::pdb;
NameMap::NameMap() {}
-std::error_code NameMap::load(StreamReader &Stream) {
+Error NameMap::load(StreamReader &Stream) {
// This is some sort of weird string-set/hash table encoded in the stream.
// It starts with the number of bytes in the table.
uint32_t NumberOfBytes;
- Stream.readInteger(NumberOfBytes);
+ if (Stream.readInteger(NumberOfBytes))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map length");
+ if (Stream.bytesRemaining() < NumberOfBytes)
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Invalid name map length");
// Following that field is the starting offset of strings in the name table.
uint32_t StringsOffset = Stream.getOffset();
@@ -30,36 +36,50 @@ std::error_code NameMap::load(StreamRead
// This appears to be equivalent to the total number of strings *actually*
// in the name table.
uint32_t HashSize;
- Stream.readInteger(HashSize);
+ if (Stream.readInteger(HashSize))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map hash size");
// This appears to be an upper bound on the number of strings in the name
// table.
uint32_t MaxNumberOfStrings;
- Stream.readInteger(MaxNumberOfStrings);
+ if (Stream.readInteger(MaxNumberOfStrings))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map max strings");
// This appears to be a hash table which uses bitfields to determine whether
// or not a bucket is 'present'.
uint32_t NumPresentWords;
- Stream.readInteger(NumPresentWords);
+ if (Stream.readInteger(NumPresentWords))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map num words");
// Store all the 'present' bits in a vector for later processing.
SmallVector<uint32_t, 1> PresentWords;
for (uint32_t I = 0; I != NumPresentWords; ++I) {
uint32_t Word;
- Stream.readInteger(Word);
+ if (Stream.readInteger(Word))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map word");
+
PresentWords.push_back(Word);
}
// This appears to be a hash table which uses bitfields to determine whether
// or not a bucket is 'deleted'.
uint32_t NumDeletedWords;
- Stream.readInteger(NumDeletedWords);
+ if (Stream.readInteger(NumDeletedWords))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map num deleted words");
// Store all the 'deleted' bits in a vector for later processing.
SmallVector<uint32_t, 1> DeletedWords;
for (uint32_t I = 0; I != NumDeletedWords; ++I) {
uint32_t Word;
- Stream.readInteger(Word);
+ if (Stream.readInteger(Word))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map deleted word");
+
DeletedWords.push_back(Word);
}
@@ -79,11 +99,15 @@ std::error_code NameMap::load(StreamRead
// This appears to be an offset relative to the start of the strings.
// It tells us where the null-terminated string begins.
uint32_t NameOffset;
- Stream.readInteger(NameOffset);
+ if (Stream.readInteger(NameOffset))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map name offset");
// This appears to be a stream number into the stream directory.
uint32_t NameIndex;
- Stream.readInteger(NameIndex);
+ if (Stream.readInteger(NameIndex))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map name index");
// Compute the offset of the start of the string relative to the stream.
uint32_t StringOffset = StringsOffset + NameOffset;
@@ -91,14 +115,16 @@ std::error_code NameMap::load(StreamRead
// Pump out our c-string from the stream.
std::string Str;
Stream.setOffset(StringOffset);
- Stream.readZeroString(Str);
+ if (Stream.readZeroString(Str))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Expected name map name");
Stream.setOffset(OldOffset);
// Add this to a string-map from name to stream number.
Mapping.insert({Str, NameIndex});
}
- return std::error_code();
+ return Error::success();
}
bool NameMap::tryGetValue(StringRef Name, uint32_t &Value) const {
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/PDBFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/PDBFile.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/PDBFile.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/PDBFile.cpp Fri May 6 15:51:57 2016
@@ -11,6 +11,7 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/DebugInfo/PDB/Raw/DbiStream.h"
#include "llvm/DebugInfo/PDB/Raw/InfoStream.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/DebugInfo/PDB/Raw/TpiStream.h"
#include "llvm/Support/Endian.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -54,18 +55,19 @@ struct llvm::pdb::PDBFileContext {
DenseMap<uint32_t, std::vector<uint32_t>> StreamMap;
};
-static std::error_code checkOffset(MemoryBufferRef M, uintptr_t Addr,
- const uint64_t Size) {
+static Error checkOffset(MemoryBufferRef M, uintptr_t Addr,
+ const uint64_t Size) {
if (Addr + Size < Addr || Addr + Size < Size ||
Addr + Size > uintptr_t(M.getBufferEnd()) ||
Addr < uintptr_t(M.getBufferStart())) {
- return std::make_error_code(std::errc::bad_address);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Invalid buffer address");
}
- return std::error_code();
+ return Error::success();
}
template <typename T>
-static std::error_code checkOffset(MemoryBufferRef M, ArrayRef<T> AR) {
+static Error checkOffset(MemoryBufferRef M, ArrayRef<T> AR) {
return checkOffset(M, uintptr_t(AR.data()), (uint64_t)AR.size() * sizeof(T));
}
@@ -117,38 +119,45 @@ StringRef PDBFile::getBlockData(uint32_t
NumBytes);
}
-std::error_code PDBFile::parseFileHeaders() {
+Error PDBFile::parseFileHeaders() {
std::error_code EC;
MemoryBufferRef BufferRef = *Context->Buffer;
// Make sure the file is sufficiently large to hold a super block.
// Do this before attempting to read the super block.
if (BufferRef.getBufferSize() < sizeof(SuperBlock))
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Does not contain superblock");
Context->SB =
reinterpret_cast<const SuperBlock *>(BufferRef.getBufferStart());
const SuperBlock *SB = Context->SB;
+ // Check the magic bytes.
+ if (memcmp(SB->MagicBytes, Magic, sizeof(Magic)) != 0)
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "MSF magic header doesn't match");
+
+ if (BufferRef.getBufferSize() % SB->BlockSize != 0)
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "File size is not a multiple of block size");
+
switch (SB->BlockSize) {
case 512: case 1024: case 2048: case 4096:
break;
default:
// An invalid block size suggests a corrupt PDB file.
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Unsupported block size.");
}
- if (BufferRef.getBufferSize() % SB->BlockSize != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
-
- // Check the magic bytes.
- if (memcmp(SB->MagicBytes, Magic, sizeof(Magic)) != 0)
- return std::make_error_code(std::errc::illegal_byte_sequence);
// We don't support blocksizes which aren't a multiple of four bytes.
- if (SB->BlockSize == 0 || SB->BlockSize % sizeof(support::ulittle32_t) != 0)
- return std::make_error_code(std::errc::not_supported);
+ if (SB->BlockSize % sizeof(support::ulittle32_t) != 0)
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Block size is not multiple of 4.");
// We don't support directories whose sizes aren't a multiple of four bytes.
if (SB->NumDirectoryBytes % sizeof(support::ulittle32_t) != 0)
- return std::make_error_code(std::errc::not_supported);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Directory size is not multiple of 4.");
// The number of blocks which comprise the directory is a simple function of
// the number of bytes it contains.
@@ -159,12 +168,13 @@ std::error_code PDBFile::parseFileHeader
// It is unclear what would happen if the number of blocks couldn't fit on a
// single block.
if (NumDirectoryBlocks > SB->BlockSize / sizeof(support::ulittle32_t))
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Too many directory blocks.");
- return std::error_code();
+ return Error::success();
}
-std::error_code PDBFile::parseStreamData() {
+Error PDBFile::parseStreamData() {
assert(Context && Context->SB);
bool SeenNumStreams = false;
@@ -237,7 +247,8 @@ std::error_code PDBFile::parseStreamData
// It seems this block doesn't belong to any stream? The stream is either
// corrupt or something more mysterious is going on.
if (StreamIdx == NumStreams)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Orphaned block found?");
StreamBlocks->push_back(Data);
}
@@ -245,7 +256,7 @@ std::error_code PDBFile::parseStreamData
// We should have read exactly SB->NumDirectoryBytes bytes.
assert(DirectoryBytesRead == SB->NumDirectoryBytes);
- return std::error_code();
+ return Error::success();
}
llvm::ArrayRef<support::ulittle32_t> PDBFile::getDirectoryBlockArray() {
@@ -255,26 +266,29 @@ llvm::ArrayRef<support::ulittle32_t> PDB
getNumDirectoryBlocks());
}
-InfoStream &PDBFile::getPDBInfoStream() {
+Expected<InfoStream &> PDBFile::getPDBInfoStream() {
if (!Info) {
Info.reset(new InfoStream(*this));
- Info->reload();
+ if (auto EC = Info->reload())
+ return std::move(EC);
}
return *Info;
}
-DbiStream &PDBFile::getPDBDbiStream() {
+Expected<DbiStream &> PDBFile::getPDBDbiStream() {
if (!Dbi) {
Dbi.reset(new DbiStream(*this));
- Dbi->reload();
+ if (auto EC = Dbi->reload())
+ return std::move(EC);
}
return *Dbi;
}
-TpiStream &PDBFile::getPDBTpiStream() {
+Expected<TpiStream &> PDBFile::getPDBTpiStream() {
if (!Tpi) {
Tpi.reset(new TpiStream(*this));
- Tpi->reload();
+ if (auto EC = Tpi->reload())
+ return std::move(EC);
}
return *Tpi;
}
Added: llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp?rev=268791&view=auto
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp (added)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/RawError.cpp Fri May 6 15:51:57 2016
@@ -0,0 +1,52 @@
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
+
+using namespace llvm;
+using namespace llvm::pdb;
+
+class RawErrorCategory : public std::error_category {
+public:
+ const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb.raw"; }
+
+ std::string message(int Condition) const override {
+ switch (static_cast<raw_error_code>(Condition)) {
+ case raw_error_code::unspecified:
+ return "An unknown error has occurred.";
+ case raw_error_code::feature_unsupported:
+ return "The feature is unsupported by the implementation.";
+ case raw_error_code::corrupt_file:
+ return "The PDB file is corrupt.";
+ case raw_error_code::insufficient_buffer:
+ return "The buffer is not large enough to read the requested number of "
+ "bytes.";
+ }
+ llvm_unreachable("Unrecognized raw_error_code");
+ }
+};
+
+static ManagedStatic<RawErrorCategory> Category;
+
+char RawError::ID = 0;
+
+RawError::RawError(raw_error_code C) : RawError(C, "") {}
+
+RawError::RawError(const std::string &Context)
+ : RawError(raw_error_code::unspecified, Context) {}
+
+RawError::RawError(raw_error_code C, const std::string &Context) : Code(C) {
+ ErrMsg = "Native PDB Error: ";
+ std::error_code EC = convertToErrorCode();
+ if (Code != raw_error_code::unspecified)
+ ErrMsg += EC.message() + " ";
+ if (!Context.empty())
+ ErrMsg += Context;
+}
+
+void RawError::log(raw_ostream &OS) const { OS << ErrMsg << "\n"; }
+
+const std::string &RawError::getErrorMessage() const { return ErrMsg; }
+
+std::error_code RawError::convertToErrorCode() const {
+ return std::error_code(static_cast<int>(Code), *Category);
+}
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/RawSession.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/RawSession.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/RawSession.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/RawSession.cpp Fri May 6 15:51:57 2016
@@ -8,11 +8,14 @@
//===----------------------------------------------------------------------===//
#include "llvm/DebugInfo/PDB/Raw/RawSession.h"
+
+#include "llvm/DebugInfo/PDB/GenericError.h"
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
#include "llvm/DebugInfo/PDB/IPDBSourceFile.h"
#include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h"
#include "llvm/DebugInfo/PDB/PDBSymbolExe.h"
#include "llvm/DebugInfo/PDB/Raw/PDBFile.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/Support/ErrorOr.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -25,33 +28,32 @@ RawSession::RawSession(std::unique_ptr<P
RawSession::~RawSession() {}
-PDB_ErrorCode RawSession::createFromPdb(StringRef Path,
- std::unique_ptr<IPDBSession> &Session) {
+Error RawSession::createFromPdb(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session) {
ErrorOr<std::unique_ptr<MemoryBuffer>> ErrorOrBuffer =
MemoryBuffer::getFileOrSTDIN(Path, /*FileSize=*/-1,
/*RequiresNullTerminator=*/false);
- std::error_code EC;
- if ((EC = ErrorOrBuffer.getError()))
- return PDB_ErrorCode::CouldNotCreateImpl;
+ if (ErrorOrBuffer.getError())
+ return make_error<GenericError>(generic_error_code::invalid_path, Path);
std::unique_ptr<MemoryBuffer> &Buffer = ErrorOrBuffer.get();
std::unique_ptr<PDBFile> File(new PDBFile(std::move(Buffer)));
- if ((EC = File->parseFileHeaders()))
- return PDB_ErrorCode::InvalidFileFormat;
- if ((EC = File->parseStreamData()))
- return PDB_ErrorCode::InvalidFileFormat;
+ if (auto EC = File->parseFileHeaders())
+ return EC;
+ if (auto EC = File->parseStreamData())
+ return EC;
Session.reset(new RawSession(std::move(File)));
- return PDB_ErrorCode::Success;
+ return Error::success();
}
-PDB_ErrorCode RawSession::createFromExe(StringRef Path,
- std::unique_ptr<IPDBSession> &Session) {
- return PDB_ErrorCode::CouldNotCreateImpl;
+Error RawSession::createFromExe(StringRef Path,
+ std::unique_ptr<IPDBSession> &Session) {
+ return llvm::make_error<RawError>(raw_error_code::feature_unsupported);
}
uint64_t RawSession::getLoadAddress() const { return 0; }
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/StreamReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/StreamReader.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/StreamReader.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/StreamReader.cpp Fri May 6 15:51:57 2016
@@ -8,42 +8,43 @@
//===----------------------------------------------------------------------===//
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
using namespace llvm;
using namespace llvm::pdb;
StreamReader::StreamReader(const StreamInterface &S) : Stream(S), Offset(0) {}
-std::error_code StreamReader::readBytes(MutableArrayRef<uint8_t> Buffer) {
+Error StreamReader::readBytes(MutableArrayRef<uint8_t> Buffer) {
if (auto EC = Stream.readBytes(Offset, Buffer))
return EC;
Offset += Buffer.size();
- return std::error_code();
+ return Error::success();
}
-std::error_code StreamReader::readInteger(uint32_t &Dest) {
+Error StreamReader::readInteger(uint32_t &Dest) {
support::ulittle32_t P;
- if (std::error_code EC = readObject(&P))
+ if (auto EC = readObject(&P))
return EC;
Dest = P;
- return std::error_code();
+ return Error::success();
}
-std::error_code StreamReader::readZeroString(std::string &Dest) {
+Error StreamReader::readZeroString(std::string &Dest) {
Dest.clear();
char C;
do {
- readObject(&C);
+ if (auto EC = readObject(&C))
+ return EC;
if (C != '\0')
Dest.push_back(C);
} while (C != '\0');
- return std::error_code();
+ return Error::success();
}
-std::error_code StreamReader::getArrayRef(ArrayRef<uint8_t> &Array,
- uint32_t Length) {
+Error StreamReader::getArrayRef(ArrayRef<uint8_t> &Array, uint32_t Length) {
if (auto EC = Stream.getArrayRef(Offset, Array, Length))
return EC;
Offset += Length;
- return std::error_code();
+ return Error::success();
}
Modified: llvm/trunk/lib/DebugInfo/PDB/Raw/TpiStream.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/PDB/Raw/TpiStream.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/PDB/Raw/TpiStream.cpp (original)
+++ llvm/trunk/lib/DebugInfo/PDB/Raw/TpiStream.cpp Fri May 6 15:51:57 2016
@@ -13,6 +13,7 @@
#include "llvm/DebugInfo/CodeView/TypeRecord.h"
#include "llvm/DebugInfo/PDB/Raw/MappedBlockStream.h"
#include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
+#include "llvm/DebugInfo/PDB/Raw/RawError.h"
#include "llvm/DebugInfo/PDB/Raw/StreamReader.h"
#include "llvm/Support/Endian.h"
@@ -60,46 +61,59 @@ TpiStream::TpiStream(PDBFile &File)
TpiStream::~TpiStream() {}
-std::error_code TpiStream::reload() {
+Error TpiStream::reload() {
StreamReader Reader(Stream);
if (Reader.bytesRemaining() < sizeof(HeaderInfo))
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "TPI Stream does not contain a header.");
Header.reset(new HeaderInfo());
- Reader.readObject(Header.get());
+ if (Reader.readObject(Header.get()))
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "TPI Stream does not contain a header.");
if (Header->Version != PdbTpiV80)
- return std::make_error_code(std::errc::not_supported);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Unsupported TPI Version.");
if (Header->HeaderSize != sizeof(HeaderInfo))
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "Corrupt TPI Header size.");
if (Header->HashKeySize != sizeof(ulittle32_t))
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "TPI Stream expected 4 byte hash key size.");
if (Header->NumHashBuckets < MinHashBuckets ||
Header->NumHashBuckets > MaxHashBuckets)
- return std::make_error_code(std::errc::illegal_byte_sequence);
+ return make_error<RawError>(raw_error_code::corrupt_file,
+ "TPI Stream Invalid number of hash buckets.");
HashFunction = HashBufferV8;
// The actual type records themselves come from this stream
- RecordsBuffer.initialize(Reader, Header->TypeRecordBytes);
+ if (auto EC = RecordsBuffer.initialize(Reader, Header->TypeRecordBytes))
+ return EC;
// Hash indices, hash values, etc come from the hash stream.
MappedBlockStream HS(Header->HashStreamIndex, Pdb);
StreamReader HSR(HS);
HSR.setOffset(Header->HashValueBuffer.Off);
- HashValuesBuffer.initialize(HSR, Header->HashValueBuffer.Length);
+ if (auto EC =
+ HashValuesBuffer.initialize(HSR, Header->HashValueBuffer.Length))
+ return EC;
HSR.setOffset(Header->HashAdjBuffer.Off);
- HashAdjBuffer.initialize(HSR, Header->HashAdjBuffer.Length);
+ if (auto EC = HashAdjBuffer.initialize(HSR, Header->HashAdjBuffer.Length))
+ return EC;
HSR.setOffset(Header->IndexOffsetBuffer.Off);
- TypeIndexOffsetBuffer.initialize(HSR, Header->IndexOffsetBuffer.Length);
+ if (auto EC = TypeIndexOffsetBuffer.initialize(
+ HSR, Header->IndexOffsetBuffer.Length))
+ return EC;
- return std::error_code();
+ return Error::success();
}
PdbRaw_TpiVer TpiStream::getTpiVersion() const {
Modified: llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp (original)
+++ llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp Fri May 6 15:51:57 2016
@@ -371,9 +371,9 @@ LLVMSymbolizer::getOrCreateModuleInfo(co
// If this is a COFF object, assume it contains PDB debug information. If
// we don't find any we will fall back to the DWARF case.
std::unique_ptr<IPDBSession> Session;
- PDB_ErrorCode Error = loadDataForEXE(PDB_ReaderType::DIA,
- Objects.first->getFileName(), Session);
- if (Error == PDB_ErrorCode::Success) {
+ auto Error = loadDataForEXE(
+ PDB_ReaderType::DIA, Objects.first->getFileName(), Session);
+ if (!Error) {
Context.reset(new PDBContext(*CoffObject, std::move(Session)));
}
}
Modified: llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test (original)
+++ llvm/trunk/test/DebugInfo/PDB/pdbdump-headers.test Fri May 6 15:51:57 2016
@@ -1238,4 +1238,4 @@
; BIG-NEXT: ]
; BIG-NEXT: }
-; BAD-BLOCK-SIZE: The file has an unrecognized format.
+; BAD-BLOCK-SIZE: The MSF superblock is in an invalid format.
Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=268791&r1=268790&r2=268791&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp Fri May 6 15:51:57 2016
@@ -26,6 +26,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Config/config.h"
+#include "llvm/DebugInfo/PDB/GenericError.h"
#include "llvm/DebugInfo/PDB/IPDBEnumChildren.h"
#include "llvm/DebugInfo/PDB/IPDBRawSymbol.h"
#include "llvm/DebugInfo/PDB/IPDBSession.h"
@@ -157,9 +158,10 @@ cl::opt<bool> NoEnumDefs("no-enum-defini
cl::cat(FilterCategory));
}
-static void dumpFileHeaders(ScopedPrinter &P, PDBFile &File) {
+static Error dumpFileHeaders(ScopedPrinter &P, PDBFile &File) {
if (!opts::DumpHeaders)
- return;
+ return Error::success();
+
DictScope D(P, "FileHeaders");
P.printNumber("BlockSize", File.getBlockSize());
P.printNumber("Unknown0", File.getUnknown0());
@@ -175,11 +177,12 @@ static void dumpFileHeaders(ScopedPrinte
// order, make up the directory.
P.printList("DirectoryBlocks", File.getDirectoryBlockArray());
P.printNumber("NumStreams", File.getNumStreams());
+ return Error::success();
}
-static void dumpStreamSizes(ScopedPrinter &P, PDBFile &File) {
+static Error dumpStreamSizes(ScopedPrinter &P, PDBFile &File) {
if (!opts::DumpStreamSizes)
- return;
+ return Error::success();
ListScope L(P, "StreamSizes");
uint32_t StreamCount = File.getNumStreams();
@@ -188,11 +191,12 @@ static void dumpStreamSizes(ScopedPrinte
Name += to_string(StreamIdx);
P.printNumber(Name, File.getStreamByteSize(StreamIdx));
}
+ return Error::success();
}
-static void dumpStreamBlocks(ScopedPrinter &P, PDBFile &File) {
+static Error dumpStreamBlocks(ScopedPrinter &P, PDBFile &File) {
if (!opts::DumpStreamBlocks)
- return;
+ return Error::success();
ListScope L(P, "StreamBlocks");
uint32_t StreamCount = File.getNumStreams();
@@ -202,15 +206,16 @@ static void dumpStreamBlocks(ScopedPrint
auto StreamBlocks = File.getStreamBlockList(StreamIdx);
P.printList(Name, StreamBlocks);
}
+ return Error::success();
}
-static void dumpStreamData(ScopedPrinter &P, PDBFile &File) {
+static Error dumpStreamData(ScopedPrinter &P, PDBFile &File) {
uint32_t StreamCount = File.getNumStreams();
StringRef DumpStreamStr = opts::DumpStreamData;
uint32_t DumpStreamNum;
if (DumpStreamStr.getAsInteger(/*Radix=*/0U, DumpStreamNum) ||
DumpStreamNum >= StreamCount)
- return;
+ return Error::success();
uint32_t StreamBytesRead = 0;
uint32_t StreamSize = File.getStreamByteSize(DumpStreamNum);
@@ -229,20 +234,31 @@ static void dumpStreamData(ScopedPrinter
outs() << StreamBlockData;
StreamBytesRead += StreamBlockData.size();
}
+ return Error::success();
}
-static void dumpInfoStream(ScopedPrinter &P, PDBFile &File) {
- InfoStream &IS = File.getPDBInfoStream();
+static Error dumpInfoStream(ScopedPrinter &P, PDBFile &File) {
+ auto InfoS = File.getPDBInfoStream();
+ if (auto EC = InfoS.takeError())
+ return EC;
+
+ InfoStream &IS = InfoS.get();
DictScope D(P, "PDB Stream");
P.printNumber("Version", IS.getVersion());
P.printHex("Signature", IS.getSignature());
P.printNumber("Age", IS.getAge());
P.printObject("Guid", IS.getGuid());
+ return Error::success();
}
-static void dumpNamedStream(ScopedPrinter &P, PDBFile &File, StringRef Stream) {
- InfoStream &IS = File.getPDBInfoStream();
+static Error dumpNamedStream(ScopedPrinter &P, PDBFile &File,
+ StringRef Stream) {
+ auto InfoS = File.getPDBInfoStream();
+ if (auto EC = InfoS.takeError())
+ return EC;
+ InfoStream &IS = InfoS.get();
+
uint32_t NameStreamIndex = IS.getNamedStreamIndex(Stream);
if (NameStreamIndex != 0) {
@@ -256,7 +272,9 @@ static void dumpNamedStream(ScopedPrinte
StreamReader Reader(NameStream);
NameHashTable NameTable;
- NameTable.load(Reader);
+ if (auto EC = NameTable.load(Reader))
+ return EC;
+
P.printHex("Signature", NameTable.getSignature());
P.printNumber("Version", NameTable.getHashVersion());
P.printNumber("Name Count", NameTable.getNameCount());
@@ -267,10 +285,14 @@ static void dumpNamedStream(ScopedPrinte
P.printString(Str);
}
}
+ return Error::success();
}
-static void dumpDbiStream(ScopedPrinter &P, PDBFile &File) {
- DbiStream &DS = File.getPDBDbiStream();
+static Error dumpDbiStream(ScopedPrinter &P, PDBFile &File) {
+ auto DbiS = File.getPDBDbiStream();
+ if (auto EC = DbiS.takeError())
+ return EC;
+ DbiStream &DS = DbiS.get();
DictScope D(P, "DBI Stream");
P.printNumber("Dbi Version", DS.getDbiVersion());
@@ -312,20 +334,25 @@ static void dumpDbiStream(ScopedPrinter
for (auto File : Modi.SourceFiles)
P.printString(File);
}
+ return Error::success();
}
-static void dumpTpiStream(ScopedPrinter &P, PDBFile &File) {
+static Error dumpTpiStream(ScopedPrinter &P, PDBFile &File) {
if (!opts::DumpTypeStream)
- return;
+ return Error::success();
DictScope D(P, "Type Info Stream");
- TpiStream &Tpi = File.getPDBTpiStream();
+ auto TpiS = File.getPDBTpiStream();
+ if (auto EC = TpiS.takeError())
+ return EC;
+ TpiStream &Tpi = TpiS.get();
+
P.printNumber("TPI Version", Tpi.getTpiVersion());
P.printNumber("Record count", Tpi.NumTypeRecords());
if (!opts::DumpTpiRecordBytes)
- return;
+ return Error::success();
ListScope L(P, "Records");
for (auto &Type : Tpi.types()) {
@@ -333,74 +360,57 @@ static void dumpTpiStream(ScopedPrinter
P.printHex("Kind", unsigned(Type.Leaf));
P.printBinaryBlock("Bytes", Type.LeafData);
}
+ return Error::success();
}
-static void dumpStructure(RawSession &RS) {
+static Error dumpStructure(RawSession &RS) {
PDBFile &File = RS.getPDBFile();
ScopedPrinter P(outs());
- dumpFileHeaders(P, File);
+ if (auto EC = dumpFileHeaders(P, File))
+ return EC;
- dumpStreamSizes(P, File);
+ if (auto EC = dumpStreamSizes(P, File))
+ return EC;
- dumpStreamBlocks(P, File);
+ if (auto EC = dumpStreamBlocks(P, File))
+ return EC;
- dumpStreamData(P, File);
+ if (auto EC = dumpStreamData(P, File))
+ return EC;
- dumpInfoStream(P, File);
+ if (auto EC = dumpInfoStream(P, File))
+ return EC;
- dumpNamedStream(P, File, "/names");
+ if (auto EC = dumpNamedStream(P, File, "/names"))
+ return EC;
- dumpDbiStream(P, File);
+ if (auto EC = dumpDbiStream(P, File))
+ return EC;
- dumpTpiStream(P, File);
-}
-
-static void reportError(StringRef Path, PDB_ErrorCode Error) {
- switch (Error) {
- case PDB_ErrorCode::Success:
- break;
- case PDB_ErrorCode::NoDiaSupport:
- outs() << "LLVM was not compiled with support for DIA. This usually means "
- "that either LLVM was not compiled with MSVC, or your MSVC "
- "installation is corrupt.\n";
- return;
- case PDB_ErrorCode::CouldNotCreateImpl:
- outs() << "Failed to connect to DIA at runtime. Verify that Visual Studio "
- "is properly installed, or that msdiaXX.dll is in your PATH.\n";
- return;
- case PDB_ErrorCode::InvalidPath:
- outs() << "Unable to load PDB at '" << Path
- << "'. Check that the file exists and is readable.\n";
- return;
- case PDB_ErrorCode::InvalidFileFormat:
- outs() << "Unable to load PDB at '" << Path
- << "'. The file has an unrecognized format.\n";
- return;
- default:
- outs() << "Unable to load PDB at '" << Path
- << "'. An unknown error occured.\n";
- return;
- }
+ if (auto EC = dumpTpiStream(P, File))
+ return EC;
+ return Error::success();
}
static void dumpInput(StringRef Path) {
std::unique_ptr<IPDBSession> Session;
if (opts::DumpHeaders || !opts::DumpStreamData.empty()) {
- PDB_ErrorCode Error = loadDataForPDB(PDB_ReaderType::Raw, Path, Session);
- if (Error == PDB_ErrorCode::Success) {
+ auto E = loadDataForPDB(PDB_ReaderType::Raw, Path, Session);
+ if (!E) {
RawSession *RS = static_cast<RawSession *>(Session.get());
- dumpStructure(*RS);
+ E = dumpStructure(*RS);
}
- reportError(Path, Error);
- outs().flush();
+ if (E)
+ logAllUnhandledErrors(std::move(E), outs(), "");
+
return;
}
- PDB_ErrorCode Error = loadDataForPDB(PDB_ReaderType::DIA, Path, Session);
- if (Error != PDB_ErrorCode::Success) {
- reportError(Path, Error);
+ Error E = loadDataForPDB(PDB_ReaderType::DIA, Path, Session);
+ if (E) {
+ logAllUnhandledErrors(std::move(E), outs(), "");
return;
}
@@ -571,6 +581,6 @@ int main(int argc_, const char *argv_[])
#if defined(HAVE_DIA_SDK)
CoUninitialize();
#endif
-
+ outs().flush();
return 0;
}
More information about the llvm-commits
mailing list