diff options
author | Lang Hames <lhames@gmail.com> | 2016-07-22 16:11:25 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2016-07-22 16:11:25 +0000 |
commit | 5e51a2e31abac0d03f5a3056d368b7cd289beff1 (patch) | |
tree | 3cfa6d2a2ff799451243715a1d8eae75289e5dfe /llvm/lib/Object/MachOUniversal.cpp | |
parent | 047149f7452ac3eeeff226683d7fb1d354fc36cf (diff) | |
download | bcm5719-llvm-5e51a2e31abac0d03f5a3056d368b7cd289beff1.tar.gz bcm5719-llvm-5e51a2e31abac0d03f5a3056d368b7cd289beff1.zip |
[Support] Make ErrorAsOutParameter take an Error* rather than an Error&.
This allows ErrorAsOutParameter to work better with "optional" errors. For
example, consider a function where for certain input values it is known that
the function can't fail. This can now be written as:
Result foo(Arg X, Error *Err) {
ErrorAsOutParameter EAO(Err);
if (<Error Condition>) {
if (Err)
*Err = <report error>;
else
llvm_unreachable("Unexpected failure!");
}
}
Rather than having to construct an ErrorAsOutParameter under every conditional
where Err is known to be non-null.
llvm-svn: 276430
Diffstat (limited to 'llvm/lib/Object/MachOUniversal.cpp')
-rw-r--r-- | llvm/lib/Object/MachOUniversal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Object/MachOUniversal.cpp b/llvm/lib/Object/MachOUniversal.cpp index 66c9151eb69..f36e84d93b9 100644 --- a/llvm/lib/Object/MachOUniversal.cpp +++ b/llvm/lib/Object/MachOUniversal.cpp @@ -114,7 +114,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", |