mirror of
https://github.com/RPCSX/llvm.git
synced 2026-01-31 01:05:23 +01:00
77be094e2f
when the object is in an archive to use something like libx.a(foo.o) as part of the error message. Also changed llvm-objdump and llvm-size to be like llvm-nm and ignore non-object files in archives and not produce any error message. To do this Archive::Child::getAsBinary() was changed from ErrorOr<...> to Expected<...> then that was threaded up to its users. Converting this interface to Expected<> from ErrorOr<> does involve touching a number of places. To contain the changes for now the use of errorToErrorCode() is still used in one place yet to be fully converted. Again there some were bugs in the existing code that did not deal with the old ErrorOr<> return values. So now with Expected<> since they must be checked and the error handled, I added a TODO and a comments for those. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@269784 91177308-0d34-0410-b5e6-96231b3b80d8
115 lines
3.5 KiB
C++
115 lines
3.5 KiB
C++
//===- Error.h - system_error extensions for Object -------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This declares a new error_category for the Object library.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_OBJECT_ERROR_H
|
|
#define LLVM_OBJECT_ERROR_H
|
|
|
|
#include "llvm/ADT/Twine.h"
|
|
#include "llvm/Support/Error.h"
|
|
#include <system_error>
|
|
|
|
namespace llvm {
|
|
namespace object {
|
|
|
|
class Binary;
|
|
|
|
const std::error_category &object_category();
|
|
|
|
enum class object_error {
|
|
// Error code 0 is absent. Use std::error_code() instead.
|
|
arch_not_found = 1,
|
|
invalid_file_type,
|
|
parse_failed,
|
|
unexpected_eof,
|
|
string_table_non_null_end,
|
|
invalid_section_index,
|
|
bitcode_section_not_found,
|
|
};
|
|
|
|
inline std::error_code make_error_code(object_error e) {
|
|
return std::error_code(static_cast<int>(e), object_category());
|
|
}
|
|
|
|
/// Base class for all errors indicating malformed binary files.
|
|
///
|
|
/// Having a subclass for all malformed binary files allows archive-walking
|
|
/// code to skip malformed files without having to understand every possible
|
|
/// way that a binary file might be malformed.
|
|
///
|
|
/// Currently inherits from ECError for easy interoperability with
|
|
/// std::error_code, but this will be removed in the future.
|
|
class BinaryError : public ErrorInfo<BinaryError, ECError> {
|
|
public:
|
|
static char ID;
|
|
BinaryError() {
|
|
// Default to parse_failed, can be overridden with setErrorCode.
|
|
setErrorCode(make_error_code(object_error::parse_failed));
|
|
}
|
|
};
|
|
|
|
/// Generic binary error.
|
|
///
|
|
/// For errors that don't require their own specific sub-error (most errors)
|
|
/// this class can be used to describe the error via a string message.
|
|
class GenericBinaryError : public ErrorInfo<GenericBinaryError, BinaryError> {
|
|
public:
|
|
static char ID;
|
|
GenericBinaryError(Twine Msg);
|
|
GenericBinaryError(Twine Msg, object_error ECOverride);
|
|
const std::string &getMessage() const { return Msg; }
|
|
void log(raw_ostream &OS) const override;
|
|
private:
|
|
std::string Msg;
|
|
};
|
|
|
|
} // end namespace object.
|
|
|
|
} // end namespace llvm.
|
|
|
|
namespace std {
|
|
template <>
|
|
struct is_error_code_enum<llvm::object::object_error> : std::true_type {};
|
|
}
|
|
|
|
namespace llvm {
|
|
namespace object {
|
|
|
|
// isNotObjectErrorInvalidFileType() is used when looping through the children
|
|
// of an archive after calling getAsBinary() on the child and it returns an
|
|
// llvm::Error. In the cases we want to loop through the children and ignore the
|
|
// non-objects in the archive this is used to test the error to see if an
|
|
// error() function needs to called on the llvm::Error.
|
|
static inline llvm::Error isNotObjectErrorInvalidFileType(llvm::Error Err) {
|
|
if (auto Err2 =
|
|
handleErrors(std::move(Err),
|
|
[](std::unique_ptr<ECError> M) {
|
|
// Try to handle 'M'. If successful, return a success value from
|
|
// the handler.
|
|
if (M->convertToErrorCode() == object_error::invalid_file_type)
|
|
return Error::success();
|
|
|
|
// We failed to handle 'M' - return it from the handler.
|
|
// This value will be passed back from catchErrors and
|
|
// wind up in Err2, where it will be returned from this function.
|
|
return Error(std::move(M));
|
|
}))
|
|
return Err2;
|
|
return Err;
|
|
}
|
|
|
|
} // end namespace object.
|
|
|
|
} // end namespace llvm.
|
|
|
|
#endif
|