diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-02-07 20:09:18 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-02-07 20:09:18 +0000 |
| commit | 732c5d90b7678eb865c59dc69a18ccbdb0167a75 (patch) | |
| tree | 484d65f4fc8334ae30ed48cec6ac20c7d94c23a1 /lib/IR/AttributeImpl.h | |
| parent | 3440864413aed0cf51397985f385ccd5baaac700 (diff) | |
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'
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@260053 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IR/AttributeImpl.h')
| -rw-r--r-- | lib/IR/AttributeImpl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h index 1b13134d37d..ca7ae5cbb29 100644 --- a/lib/IR/AttributeImpl.h +++ b/lib/IR/AttributeImpl.h @@ -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; } |