[llvm] r247182 - Revert "Bitcode Writer: EmitRecordWith* takes an ArrayRef instead of a SmallVector (NFC)"

[David Blaikie via llvm-commits]

It's helpful to mention when reverting a patch why it was reverted (same
goes for the Clang revert) - so someone else doesn't come along later and
hit the same problem.

On Wed, Sep 9, 2015 at 1:35 PM, Mehdi Amini via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: mehdi_amini
> Date: Wed Sep  9 15:35:15 2015
> New Revision: 247182
>
> URL: http://llvm.org/viewvc/llvm-project?rev=247182&view=rev
> Log:
> Revert "Bitcode Writer: EmitRecordWith* takes an ArrayRef instead of a
> SmallVector (NFC)"
>
> This reverts commit r247178.
>
> From: Mehdi Amini <mehdi.amini at apple.com>
>
> Modified:
>     llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h
>
> Modified: llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h?rev=247182&r1=247181&r2=247182&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h (original)
> +++ llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h Wed Sep  9 15:35:15
> 2015
> @@ -15,7 +15,6 @@
>  #ifndef LLVM_BITCODE_BITSTREAMWRITER_H
>  #define LLVM_BITCODE_BITSTREAMWRITER_H
>
> -#include "llvm/ADT/ArrayRef.h"
>  #include "llvm/ADT/SmallVector.h"
>  #include "llvm/ADT/StringRef.h"
>  #include "llvm/Bitcode/BitCodes.h"
> @@ -287,8 +286,8 @@ private:
>    /// emission code.  If BlobData is non-null, then it specifies an array
> of
>    /// data that should be emitted as part of the Blob or Array operand
> that is
>    /// known to exist at the end of the record.
> -  template <typename uintty>
> -  void EmitRecordWithAbbrevImpl(unsigned Abbrev, const ArrayRef<uintty>
> &Vals,
> +  template<typename uintty>
> +  void EmitRecordWithAbbrevImpl(unsigned Abbrev, SmallVectorImpl<uintty>
> &Vals,
>                                  StringRef Blob) {
>      const char *BlobData = Blob.data();
>      unsigned BlobLen = (unsigned) Blob.size();
> @@ -399,14 +398,14 @@ public:
>      // Insert the code into Vals to treat it uniformly.
>      Vals.insert(Vals.begin(), Code);
>
> -    EmitRecordWithAbbrev(Abbrev, makeArrayRef(Vals));
> +    EmitRecordWithAbbrev(Abbrev, Vals);
>    }
>
>    /// EmitRecordWithAbbrev - Emit a record with the specified
> abbreviation.
>    /// Unlike EmitRecord, the code for the record should be included in
> Vals as
>    /// the first entry.
> -  template <typename uintty>
> -  void EmitRecordWithAbbrev(unsigned Abbrev, const ArrayRef<uintty>
> &Vals) {
> +  template<typename uintty>
> +  void EmitRecordWithAbbrev(unsigned Abbrev, SmallVectorImpl<uintty>
> &Vals) {
>      EmitRecordWithAbbrevImpl(Abbrev, Vals, StringRef());
>    }
>
> @@ -415,27 +414,27 @@ public:
>    /// specified by the pointer and length specified at the end.  In
> contrast to
>    /// EmitRecord, this routine expects that the first entry in Vals is
> the code
>    /// of the record.
> -  template <typename uintty>
> -  void EmitRecordWithBlob(unsigned Abbrev, const ArrayRef<uintty> &Vals,
> +  template<typename uintty>
> +  void EmitRecordWithBlob(unsigned Abbrev, SmallVectorImpl<uintty> &Vals,
>                            StringRef Blob) {
>      EmitRecordWithAbbrevImpl(Abbrev, Vals, Blob);
>    }
> -  template <typename uintty>
> -  void EmitRecordWithBlob(unsigned Abbrev, const ArrayRef<uintty> &Vals,
> +  template<typename uintty>
> +  void EmitRecordWithBlob(unsigned Abbrev, SmallVectorImpl<uintty> &Vals,
>                            const char *BlobData, unsigned BlobLen) {
>      return EmitRecordWithAbbrevImpl(Abbrev, Vals, StringRef(BlobData,
> BlobLen));
>    }
>
>    /// EmitRecordWithArray - Just like EmitRecordWithBlob, works with
> records
>    /// that end with an array.
> -  template <typename uintty>
> -  void EmitRecordWithArray(unsigned Abbrev, const ArrayRef<uintty> &Vals,
> -                           StringRef Array) {
> +  template<typename uintty>
> +  void EmitRecordWithArray(unsigned Abbrev, SmallVectorImpl<uintty> &Vals,
> +                          StringRef Array) {
>      EmitRecordWithAbbrevImpl(Abbrev, Vals, Array);
>    }
> -  template <typename uintty>
> -  void EmitRecordWithArray(unsigned Abbrev, const ArrayRef<uintty> &Vals,
> -                           const char *ArrayData, unsigned ArrayLen) {
> +  template<typename uintty>
> +  void EmitRecordWithArray(unsigned Abbrev, SmallVectorImpl<uintty> &Vals,
> +                          const char *ArrayData, unsigned ArrayLen) {
>      return EmitRecordWithAbbrevImpl(Abbrev, Vals, StringRef(ArrayData,
>                                                              ArrayLen));
>    }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150909/e52d8b72/attachment.html>