Commit c55cf4af authored by Bill Wendling's avatar Bill Wendling
Browse files

Revert "Remove redundant "std::move"s in return statements" 

The build failed with

  error: call to deleted constructor of 'llvm::Error'

errors.

This reverts commit 1c2241a7.
parent 5ad62d3b

llvm/include/llvm/Bitstream/BitstreamReader.h

+3 −3
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public: 
    unsigned BitsLeft = NumBits - BitsInCurWord;



    if (Error fillResult = fillCurWord())

      return fillResult;

      return std::move(fillResult);



    // If we run out of data, abort.

    if (BitsLeft > BitsInCurWord)
@@ -425,7 +425,7 @@ public: 
        // We read and accumulate abbrev's, the client can't do anything with

        // them anyway.

        if (Error Err = ReadAbbrevRecord())

          return Err;

          return std::move(Err);

        continue;

      }
@@ -448,7 +448,7 @@ public: 


      // If we found a sub-block, just skip over it and check the next entry.

      if (Error Err = SkipBlock())

        return Err;

        return std::move(Err);

    }

  }

llvm/include/llvm/DebugInfo/CodeView/CVRecord.h

+2 −2
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ inline Expected<CVRecord<Kind>> readCVRecordFromStream(BinaryStreamRef Stream, 
  Reader.setOffset(Offset);



  if (auto EC = Reader.readObject(Prefix))

    return EC;

    return std::move(EC);

  if (Prefix->RecordLen < 2)

    return make_error<CodeViewError>(cv_error_code::corrupt_record);



  Reader.setOffset(Offset);

  ArrayRef<uint8_t> RawData;

  if (auto EC = Reader.readBytes(RawData, Prefix->RecordLen + sizeof(uint16_t)))

    return EC;

    return std::move(EC);

  return codeview::CVRecord<Kind>(RawData);

}

llvm/include/llvm/DebugInfo/CodeView/SymbolDeserializer.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public: 
  template <typename T> static Expected<T> deserializeAs(CVSymbol Symbol) {

    T Record(static_cast<SymbolRecordKind>(Symbol.kind()));

    if (auto EC = deserializeAs<T>(Symbol, Record))

      return EC;

      return std::move(EC);

    return Record;

  }

llvm/include/llvm/DebugInfo/CodeView/TypeDeserializer.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public: 
    T Record(K);

    CVType CVT(Data);

    if (auto EC = deserializeAs<T>(CVT, Record))

      return EC;

      return std::move(EC);

    return Record;

  }

llvm/include/llvm/DebugInfo/DWARF/DWARFListTable.h

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ DWARFListTableBase<DWARFListType>::findList(DWARFDataExtractor Data, 
  if (Error E =

          List.extract(Data, getHeaderOffset(), End, &Offset,

                       Header.getSectionName(), Header.getListTypeString()))

    return E;

    return std::move(E);

  ListMap[StartingOffset] = List;

  return List;

}