[llvm] b8fbffc - [BitstreamReader] Fix incorrect error forwarding

[Nikita Popov via llvm-commits]

Author: Nikita Popov
Date: 2022-02-04T17:31:12+01:00
New Revision: b8fbffc8b11f152cd2dec44aaeb42d89afdf7892

URL: https://github.com/llvm/llvm-project/commit/b8fbffc8b11f152cd2dec44aaeb42d89afdf7892
DIFF: https://github.com/llvm/llvm-project/commit/b8fbffc8b11f152cd2dec44aaeb42d89afdf7892.diff

LOG: [BitstreamReader] Fix incorrect error forwarding

This code clearly intended to forward the error, but instead
returned the non-error result.

Added: 
    

Modified: 
    llvm/lib/Bitstream/Reader/BitstreamReader.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Bitstream/Reader/BitstreamReader.cpp b/llvm/lib/Bitstream/Reader/BitstreamReader.cpp
index 751caa272ef1..3865af1f3889 100644
--- a/llvm/lib/Bitstream/Reader/BitstreamReader.cpp
+++ b/llvm/lib/Bitstream/Reader/BitstreamReader.cpp
@@ -101,7 +101,7 @@ Expected<unsigned> BitstreamCursor::skipRecord(unsigned AbbrevID) {
     unsigned Code = MaybeCode.get();
     Expected<uint32_t> MaybeVBR = ReadVBR(6);
     if (!MaybeVBR)
-      return MaybeVBR.get();
+      return MaybeVBR.takeError();
     unsigned NumElts = MaybeVBR.get();
     for (unsigned i = 0; i != NumElts; ++i)
       if (Expected<uint64_t> Res = ReadVBR64(6))