[llvm] r260053 - Revert 259942, r259943, r259948.

[Richard Smith via llvm-commits]

Thanks for the revert, I thought I'd got all the bots happy but apparently
some versions of MSVC were still broken :(

I'll see if I can get MSVC to accept an even dumber approach...

On Sun, Feb 7, 2016 at 12:09 PM, Nico Weber via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: nico
> Date: Sun Feb  7 14:09:18 2016
> New Revision: 260053
>
> URL: http://llvm.org/viewvc/llvm-project?rev=260053&view=rev
> Log:
> Revert 259942, r259943, r259948.
>
> The Windows bots have been failing for the last two days, with:
>
> FAILED: C:\PROGRA~2\MICROS~1.0\VC\bin\amd64\cl.exe -c LLVMContextImpl.cpp
> D:\buildslave\clang-x64-ninja-win7\llvm\lib\IR\LLVMContextImpl.cpp(137) :
>     error C2248: 'llvm::TrailingObjects<llvm::AttributeSetImpl,
>                                         llvm::IndexAttrPair>::operator
> delete' :
>         cannot access private member declared in class
> 'llvm::AttributeSetImpl'
>     TrailingObjects.h(298) : see declaration of
>         'llvm::TrailingObjects<llvm::AttributeSetImpl,
>                                llvm::IndexAttrPair>::operator delete'
>     AttributeImpl.h(213) : see declaration of 'llvm::AttributeSetImpl'
>
> Modified:
>     llvm/trunk/include/llvm/Support/TrailingObjects.h
>     llvm/trunk/lib/IR/AttributeImpl.h
>     llvm/trunk/unittests/Support/TrailingObjectsTest.cpp
>
> Modified: llvm/trunk/include/llvm/Support/TrailingObjects.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/TrailingObjects.h?rev=260053&r1=260052&r2=260053&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Support/TrailingObjects.h (original)
> +++ llvm/trunk/include/llvm/Support/TrailingObjects.h Sun Feb  7 14:09:18
> 2016
> @@ -290,13 +290,9 @@ class TrailingObjects : private trailing
>    }
>
>  public:
> -  // Make this (privately inherited) member public.
> +  // make this (privately inherited) class public.
>    using ParentType::OverloadToken;
>
> -  /// Disable sized deallocation for all objects with trailing object
> storage;
> -  /// the inferred size will typically not be correct.
> -  void operator delete(void *P) { return ::operator delete(P); }
> -
>    /// Returns a pointer to the trailing object array of the given type
>    /// (which must be one of those specified in the class template). The
>    /// array may have zero or more elements in it.
>
> Modified: llvm/trunk/lib/IR/AttributeImpl.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AttributeImpl.h?rev=260053&r1=260052&r2=260053&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/IR/AttributeImpl.h (original)
> +++ llvm/trunk/lib/IR/AttributeImpl.h Sun Feb  7 14:09:18 2016
> @@ -171,8 +171,6 @@ class AttributeSetNode final
>    void operator=(const AttributeSetNode &) = delete;
>    AttributeSetNode(const AttributeSetNode &) = delete;
>  public:
> -  using TrailingObjects<AttributeSetNode, Attribute>::operator delete;
> -
>    static AttributeSetNode *get(LLVMContext &C, ArrayRef<Attribute> Attrs);
>
>    bool hasAttribute(Attribute::AttrKind Kind) const {
> @@ -268,8 +266,6 @@ public:
>      }
>    }
>
> -  using TrailingObjects<AttributeSetImpl, IndexAttrPair>::operator delete;
> -
>    /// \brief Get the context that created this AttributeSetImpl.
>    LLVMContext &getContext() { return Context; }
>
>
> Modified: llvm/trunk/unittests/Support/TrailingObjectsTest.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/TrailingObjectsTest.cpp?rev=260053&r1=260052&r2=260053&view=diff
>
> ==============================================================================
> --- llvm/trunk/unittests/Support/TrailingObjectsTest.cpp (original)
> +++ llvm/trunk/unittests/Support/TrailingObjectsTest.cpp Sun Feb  7
> 14:09:18 2016
> @@ -34,7 +34,6 @@ public:
>      void *Mem = ::operator new(totalSizeToAlloc<short>(NumShorts));
>      return new (Mem) Class1(ShortArray, NumShorts);
>    }
> -  using TrailingObjects::operator delete;
>
>    short get(unsigned Num) const { return
> getTrailingObjects<short>()[Num]; }
>
> @@ -79,7 +78,6 @@ public:
>        *C->getTrailingObjects<double>() = D;
>      return C;
>    }
> -  using TrailingObjects::operator delete;
>
>    short getShort() const {
>      if (!HasShort)
>
>
> _______________________________________________
> 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/20160208/ff1111f3/attachment.html>