[llvm] d02c167 - [Support][Error] Add ErrorAsOutParameter constructor that takes an Error by ref.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 28 20:58:00 PST 2024
Author: Lang Hames
Date: 2024-11-29T15:57:53+11:00
New Revision: d02c1676d75a6bab1252b48da9a955fc7dc1251f
URL: https://github.com/llvm/llvm-project/commit/d02c1676d75a6bab1252b48da9a955fc7dc1251f
DIFF: https://github.com/llvm/llvm-project/commit/d02c1676d75a6bab1252b48da9a955fc7dc1251f.diff
LOG: [Support][Error] Add ErrorAsOutParameter constructor that takes an Error by ref.
ErrorAsOutParameter's Error* constructor supports cases where an Error might not
be passed in (because in the calling context it's known that this call won't
fail). Most clients always have an Error present however, and for them an Error&
overload is more convenient.
Added:
Modified:
llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
llvm/include/llvm/Object/ELF.h
llvm/include/llvm/Support/Error.h
llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
llvm/lib/ExecutionEngine/Orc/Core.cpp
llvm/lib/ExecutionEngine/Orc/DebugObjectManagerPlugin.cpp
llvm/lib/ExecutionEngine/Orc/ELFNixPlatform.cpp
llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp
llvm/lib/Object/Archive.cpp
llvm/lib/Object/GOFFObjectFile.cpp
llvm/lib/Object/MachOObjectFile.cpp
llvm/lib/Object/MachOUniversal.cpp
llvm/lib/Object/Minidump.cpp
llvm/lib/Object/TapiUniversal.cpp
llvm/lib/Object/WasmObjectFile.cpp
llvm/lib/Object/XCOFFObjectFile.cpp
llvm/lib/Support/DataExtractor.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h b/llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
index 14e9c0610bf6a6..a8129d70572c08 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
@@ -135,7 +135,7 @@ template <typename ORCABI> class LocalTrampolinePool : public TrampolinePool {
LocalTrampolinePool(ResolveLandingFunction ResolveLanding, Error &Err)
: ResolveLanding(std::move(ResolveLanding)) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
/// Try to set up the resolver block.
std::error_code EC;
@@ -262,7 +262,7 @@ class LocalJITCompileCallbackManager : public JITCompileCallbackManager {
using NotifyLandingResolvedFunction =
TrampolinePool::NotifyLandingResolvedFunction;
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
auto TP = LocalTrampolinePool<ORCABI>::Create(
[this](ExecutorAddr TrampolineAddr,
NotifyLandingResolvedFunction NotifyLandingResolved) {
diff --git a/llvm/include/llvm/Object/ELF.h b/llvm/include/llvm/Object/ELF.h
index 6aff1e62276b03..3aa1d7864fcb70 100644
--- a/llvm/include/llvm/Object/ELF.h
+++ b/llvm/include/llvm/Object/ELF.h
@@ -401,7 +401,7 @@ class ELFFile {
/// be checked after iteration ends.
Elf_Note_Iterator notes_begin(const Elf_Phdr &Phdr, Error &Err) const {
assert(Phdr.p_type == ELF::PT_NOTE && "Phdr is not of type PT_NOTE");
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
if (Phdr.p_offset + Phdr.p_filesz > getBufSize()) {
Err =
createError("invalid offset (0x" + Twine::utohexstr(Phdr.p_offset) +
@@ -429,7 +429,7 @@ class ELFFile {
/// be checked after iteration ends.
Elf_Note_Iterator notes_begin(const Elf_Shdr &Shdr, Error &Err) const {
assert(Shdr.sh_type == ELF::SHT_NOTE && "Shdr is not of type SHT_NOTE");
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
if (Shdr.sh_offset + Shdr.sh_size > getBufSize()) {
Err =
createError("invalid offset (0x" + Twine::utohexstr(Shdr.sh_offset) +
diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h
index cb06ac19f0bb7d..90120156ec2ead 100644
--- a/llvm/include/llvm/Support/Error.h
+++ b/llvm/include/llvm/Support/Error.h
@@ -1129,12 +1129,17 @@ inline bool errorToBool(Error Err) {
/// function.
class ErrorAsOutParameter {
public:
+
ErrorAsOutParameter(Error *Err) : Err(Err) {
// Raise the checked bit if Err is success.
if (Err)
(void)!!*Err;
}
+ ErrorAsOutParameter(Error &Err) : Err(&Err) {
+ (void)!!Err;
+ }
+
~ErrorAsOutParameter() {
// Clear the checked bit.
if (Err && !*Err)
diff --git a/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
index 3257a2ae94f66d..01b9deab4313f6 100644
--- a/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/COFF_x86_64.cpp
@@ -256,7 +256,7 @@ class COFFLinkGraphLowering_x86_64 {
Error Err = Error::success();
Ctx.lookup(Symbols,
createLookupContinuation([&](Expected<AsyncLookupResult> LR) {
- ErrorAsOutParameter EAO(&Err);
+ ErrorAsOutParameter _(Err);
if (!LR) {
Err = LR.takeError();
return;
diff --git a/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp b/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
index 2176acc5bba807..007e18e3073997 100644
--- a/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
@@ -399,7 +399,7 @@ COFFPlatform::COFFPlatform(
OrcRuntimeArchive(std::move(OrcRuntimeArchive)),
StaticVCRuntime(StaticVCRuntime),
COFFHeaderStartSymbol(ES.intern("__ImageBase")) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
Bootstrapping.store(true);
ObjLinkingLayer.addPlugin(std::make_unique<COFFPlatformPlugin>(*this));
diff --git a/llvm/lib/ExecutionEngine/Orc/Core.cpp b/llvm/lib/ExecutionEngine/Orc/Core.cpp
index 43c8cda558e186..222135bd776885 100644
--- a/llvm/lib/ExecutionEngine/Orc/Core.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/Core.cpp
@@ -1809,7 +1809,7 @@ ExecutionSession::lookup(const JITDylibSearchOrder &SearchOrder,
if (R)
PromisedResult.set_value(std::move(*R));
else {
- ErrorAsOutParameter _(&ResolutionError);
+ ErrorAsOutParameter _(ResolutionError);
ResolutionError = R.takeError();
PromisedResult.set_value(SymbolMap());
}
@@ -1820,7 +1820,7 @@ ExecutionSession::lookup(const JITDylibSearchOrder &SearchOrder,
Error ResolutionError = Error::success();
auto NotifyComplete = [&](Expected<SymbolMap> R) {
- ErrorAsOutParameter _(&ResolutionError);
+ ErrorAsOutParameter _(ResolutionError);
if (R)
Result = std::move(*R);
else
diff --git a/llvm/lib/ExecutionEngine/Orc/DebugObjectManagerPlugin.cpp b/llvm/lib/ExecutionEngine/Orc/DebugObjectManagerPlugin.cpp
index 9859e4a4c6fd16..6d472c2ba100b5 100644
--- a/llvm/lib/ExecutionEngine/Orc/DebugObjectManagerPlugin.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/DebugObjectManagerPlugin.cpp
@@ -234,7 +234,7 @@ static bool isDwarfSection(StringRef SectionName) {
std::unique_ptr<WritableMemoryBuffer>
ELFDebugObject::CopyBuffer(MemoryBufferRef Buffer, Error &Err) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
size_t Size = Buffer.getBufferSize();
StringRef Name = Buffer.getBufferIdentifier();
if (auto Copy = WritableMemoryBuffer::getNewUninitMemBuffer(Size, Name)) {
diff --git a/llvm/lib/ExecutionEngine/Orc/ELFNixPlatform.cpp b/llvm/lib/ExecutionEngine/Orc/ELFNixPlatform.cpp
index c48c73769955a1..431c64996b2c56 100644
--- a/llvm/lib/ExecutionEngine/Orc/ELFNixPlatform.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/ELFNixPlatform.cpp
@@ -396,7 +396,7 @@ ELFNixPlatform::ELFNixPlatform(
: ES(ObjLinkingLayer.getExecutionSession()), PlatformJD(PlatformJD),
ObjLinkingLayer(ObjLinkingLayer),
DSOHandleSymbol(ES.intern("__dso_handle")) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
ObjLinkingLayer.addPlugin(std::make_unique<ELFNixPlatformPlugin>(*this));
PlatformJD.addGenerator(std::move(OrcRuntimeGenerator));
diff --git a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
index edb49a41ecd120..bad6a9f06cb160 100644
--- a/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/ExecutionUtils.cpp
@@ -467,7 +467,7 @@ StaticLibraryDefinitionGenerator::StaticLibraryDefinitionGenerator(
GetObjectFileInterface GetObjFileInterface, Error &Err)
: L(L), GetObjFileInterface(std::move(GetObjFileInterface)),
ArchiveBuffer(std::move(ArchiveBuffer)), Archive(std::move(Archive)) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
if (!this->GetObjFileInterface)
this->GetObjFileInterface = getObjectFileInterface;
if (!Err)
diff --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
index b49c80b9287edc..59bd95e96167f7 100644
--- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
@@ -1006,7 +1006,7 @@ LLJIT::createCompileFunction(LLJITBuilderState &S,
LLJIT::LLJIT(LLJITBuilderState &S, Error &Err)
: DL(std::move(*S.DL)), TT(S.JTMB->getTargetTriple()) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
assert(!(S.EPC && S.ES) && "EPC and ES should not both be set");
diff --git a/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp b/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp
index b4326a17de3b7b..3e02beb0baa868 100644
--- a/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/MachOPlatform.cpp
@@ -477,7 +477,7 @@ MachOPlatform::MachOPlatform(
: ES(ObjLinkingLayer.getExecutionSession()), PlatformJD(PlatformJD),
ObjLinkingLayer(ObjLinkingLayer),
BuildMachOHeaderMU(std::move(BuildMachOHeaderMU)) {
- ErrorAsOutParameter _(&Err);
+ ErrorAsOutParameter _(Err);
ObjLinkingLayer.addPlugin(std::make_unique<MachOPlatformPlugin>(*this));
PlatformJD.addGenerator(std::move(OrcRuntimeGenerator));
diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp
index e755e8161d36d6..92f31c909efd47 100644
--- a/llvm/lib/Object/Archive.cpp
+++ b/llvm/lib/Object/Archive.cpp
@@ -707,7 +707,7 @@ void Archive::setFirstRegular(const Child &C) {
Archive::Archive(MemoryBufferRef Source, Error &Err)
: Binary(Binary::ID_Archive, Source) {
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
StringRef Buffer = Data.getBuffer();
// Check for sufficient magic.
if (Buffer.starts_with(ThinArchiveMagic)) {
diff --git a/llvm/lib/Object/GOFFObjectFile.cpp b/llvm/lib/Object/GOFFObjectFile.cpp
index 3b8704f28fdbb7..e3c4383d27aadb 100644
--- a/llvm/lib/Object/GOFFObjectFile.cpp
+++ b/llvm/lib/Object/GOFFObjectFile.cpp
@@ -35,7 +35,7 @@ ObjectFile::createGOFFObjectFile(MemoryBufferRef Object) {
GOFFObjectFile::GOFFObjectFile(MemoryBufferRef Object, Error &Err)
: ObjectFile(Binary::ID_GOFF, Object) {
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
// Object file isn't the right size, bail out early.
if ((Object.getBufferSize() % GOFF::RecordLength) != 0) {
Err = createStringError(
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index 46ed3b2ff7c581..69d36e6a77db79 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -1270,7 +1270,7 @@ MachOObjectFile::MachOObjectFile(MemoryBufferRef Object, bool IsLittleEndian,
size_t MachOFilesetEntryOffset)
: ObjectFile(getMachOType(IsLittleEndian, Is64bits), Object),
MachOFilesetEntryOffset(MachOFilesetEntryOffset) {
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
uint64_t SizeOfHeaders;
uint32_t cputype;
if (is64Bit()) {
diff --git a/llvm/lib/Object/MachOUniversal.cpp b/llvm/lib/Object/MachOUniversal.cpp
index 655875f3396c1a..31bb2a619ff334 100644
--- a/llvm/lib/Object/MachOUniversal.cpp
+++ b/llvm/lib/Object/MachOUniversal.cpp
@@ -131,7 +131,7 @@ MachOUniversalBinary::create(MemoryBufferRef Source) {
MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, Error &Err)
: Binary(Binary::ID_MachOUniversalBinary, Source), Magic(0),
NumberOfObjects(0) {
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
if (Data.getBufferSize() < sizeof(MachO::fat_header)) {
Err = make_error<GenericBinaryError>("File too small to be a Mach-O "
"universal file",
diff --git a/llvm/lib/Object/Minidump.cpp b/llvm/lib/Object/Minidump.cpp
index a96e23893bfbad..41a5da73c77835 100644
--- a/llvm/lib/Object/Minidump.cpp
+++ b/llvm/lib/Object/Minidump.cpp
@@ -145,7 +145,7 @@ MinidumpFile::create(MemoryBufferRef Source) {
iterator_range<MinidumpFile::FallibleMemory64Iterator>
MinidumpFile::getMemory64List(Error &Err) const {
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
auto end = FallibleMemory64Iterator::end(Memory64Iterator::end());
Expected<minidump::Memory64ListHeader> ListHeader = getMemoryList64Header();
if (!ListHeader) {
diff --git a/llvm/lib/Object/TapiUniversal.cpp b/llvm/lib/Object/TapiUniversal.cpp
index 6667a68f5c8c63..74e0c519ddfdb5 100644
--- a/llvm/lib/Object/TapiUniversal.cpp
+++ b/llvm/lib/Object/TapiUniversal.cpp
@@ -22,7 +22,7 @@ using namespace object;
TapiUniversal::TapiUniversal(MemoryBufferRef Source, Error &Err)
: Binary(ID_TapiUniversal, Source) {
Expected<std::unique_ptr<InterfaceFile>> Result = TextAPIReader::get(Source);
- ErrorAsOutParameter ErrAsOuParam(&Err);
+ ErrorAsOutParameter ErrAsOuParam(Err);
if (!Result) {
Err = Result.takeError();
return;
diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp
index dcd728dfa2d95f..2c9b878a4cde93 100644
--- a/llvm/lib/Object/WasmObjectFile.cpp
+++ b/llvm/lib/Object/WasmObjectFile.cpp
@@ -344,7 +344,7 @@ static Error readSection(WasmSection &Section, WasmObjectFile::ReadContext &Ctx,
WasmObjectFile::WasmObjectFile(MemoryBufferRef Buffer, Error &Err)
: ObjectFile(Binary::ID_Wasm, Buffer) {
- ErrorAsOutParameter ErrAsOutParam(&Err);
+ ErrorAsOutParameter ErrAsOutParam(Err);
Header.Magic = getData().substr(0, 4);
if (Header.Magic != StringRef("\0asm", 4)) {
Err = make_error<StringError>("invalid magic number",
diff --git a/llvm/lib/Object/XCOFFObjectFile.cpp b/llvm/lib/Object/XCOFFObjectFile.cpp
index cc0da5db524256..df3b2a091aec2e 100644
--- a/llvm/lib/Object/XCOFFObjectFile.cpp
+++ b/llvm/lib/Object/XCOFFObjectFile.cpp
@@ -1414,7 +1414,7 @@ TBVectorExt::TBVectorExt(StringRef TBvectorStrRef, Error &Err) {
unsigned ParmsNum =
GETVALUEWITHMASKSHIFT(NumberOfVectorParmsMask, NumberOfVectorParmsShift);
- ErrorAsOutParameter EAO(&Err);
+ ErrorAsOutParameter EAO(Err);
Expected<SmallString<32>> VecParmsTypeOrError =
parseVectorParmsType(VecParmsTypeValue, ParmsNum);
if (!VecParmsTypeOrError)
@@ -1458,7 +1458,7 @@ XCOFFTracebackTable::create(const uint8_t *Ptr, uint64_t &Size, bool Is64Bit) {
XCOFFTracebackTable::XCOFFTracebackTable(const uint8_t *Ptr, uint64_t &Size,
Error &Err, bool Is64Bit)
: TBPtr(Ptr), Is64BitObj(Is64Bit) {
- ErrorAsOutParameter EAO(&Err);
+ ErrorAsOutParameter EAO(Err);
DataExtractor DE(ArrayRef<uint8_t>(Ptr, Size), /*IsLittleEndian=*/false,
/*AddressSize=*/0);
DataExtractor::Cursor Cur(/*Offset=*/0);
diff --git a/llvm/lib/Support/DataExtractor.cpp b/llvm/lib/Support/DataExtractor.cpp
index eac3c32cfd3b79..3da9511bf2669f 100644
--- a/llvm/lib/Support/DataExtractor.cpp
+++ b/llvm/lib/Support/DataExtractor.cpp
@@ -227,7 +227,7 @@ int64_t DataExtractor::getSLEB128(uint64_t *offset_ptr, Error *Err) const {
}
void DataExtractor::skip(Cursor &C, uint64_t Length) const {
- ErrorAsOutParameter ErrAsOut(&C.Err);
+ ErrorAsOutParameter ErrAsOut(C.Err);
if (isError(&C.Err))
return;
More information about the llvm-commits
mailing list