Skip to content

Commit 391e7d8

Browse files
committed
Update to match llvm r279473: remove ilist_*sentinel_traits.
1 parent 9964697 commit 391e7d8

File tree

9 files changed

+0
-38
lines changed

9 files changed

+0
-38
lines changed

include/swift/SIL/SILBasicBlock.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
4545
/// The ordered set of instructions in the SILBasicBlock.
4646
InstListType InstList;
4747

48-
friend struct llvm::ilist_sentinel_traits<SILBasicBlock>;
4948
friend struct llvm::ilist_traits<SILBasicBlock>;
5049
SILBasicBlock() : Parent(0) {}
5150
void operator=(const SILBasicBlock &) = delete;
@@ -316,10 +315,6 @@ namespace llvm {
316315
// ilist_traits for SILBasicBlock
317316
//===----------------------------------------------------------------------===//
318317

319-
template <>
320-
struct ilist_sentinel_traits<::swift::SILBasicBlock> :
321-
public ilist_half_embedded_sentinel_traits<::swift::SILBasicBlock> {};
322-
323318
template <>
324319
struct ilist_traits<::swift::SILBasicBlock> :
325320
public ilist_default_traits<::swift::SILBasicBlock> {

include/swift/SIL/SILCoverageMap.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,6 @@ namespace llvm {
138138
// ilist_traits for SILCoverageMap
139139
//===----------------------------------------------------------------------===//
140140

141-
template <>
142-
struct ilist_sentinel_traits<::swift::SILCoverageMap> :
143-
public ilist_half_embedded_sentinel_traits<::swift::SILCoverageMap> {};
144-
145141
template <>
146142
struct ilist_traits<::swift::SILCoverageMap> :
147143
public ilist_default_traits<::swift::SILCoverageMap> {

include/swift/SIL/SILDefaultWitnessTable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,6 @@ class SILDefaultWitnessTable : public llvm::ilist_node<SILDefaultWitnessTable>,
176176

177177
namespace llvm {
178178

179-
template <>
180-
struct ilist_sentinel_traits<::swift::SILDefaultWitnessTable> :
181-
public ilist_half_embedded_sentinel_traits<::swift::SILDefaultWitnessTable> {};
182-
183179
template <>
184180
struct ilist_traits<::swift::SILDefaultWitnessTable> :
185181
public ilist_default_traits<::swift::SILDefaultWitnessTable> {

include/swift/SIL/SILFunction.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -749,10 +749,6 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
749749

750750
namespace llvm {
751751

752-
template <>
753-
struct ilist_sentinel_traits<::swift::SILFunction> :
754-
public ilist_half_embedded_sentinel_traits<::swift::SILFunction> {};
755-
756752
template <>
757753
struct ilist_traits<::swift::SILFunction> :
758754
public ilist_default_traits<::swift::SILFunction> {

include/swift/SIL/SILGlobalVariable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
196196

197197
namespace llvm {
198198

199-
template <>
200-
struct ilist_sentinel_traits<::swift::SILGlobalVariable> :
201-
public ilist_half_embedded_sentinel_traits<::swift::SILGlobalVariable> {};
202-
203199
template <>
204200
struct ilist_traits<::swift::SILGlobalVariable> :
205201
public ilist_default_traits<::swift::SILGlobalVariable> {

include/swift/SIL/SILInstruction.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class SILInstruction : public ValueBase,public llvm::ilist_node<SILInstruction>{
6969
/// used for debug info and diagnostics.
7070
SILDebugLocation Location;
7171

72-
friend struct llvm::ilist_sentinel_traits<SILInstruction>;
7372
SILInstruction() = delete;
7473
void operator=(const SILInstruction &) = delete;
7574
void operator delete(void *Ptr, size_t) = delete;
@@ -5432,10 +5431,6 @@ SILFunction *ApplyInstBase<Impl, Base, false>::getCalleeFunction() const {
54325431

54335432
namespace llvm {
54345433

5435-
template <>
5436-
struct ilist_sentinel_traits<::swift::SILInstruction> :
5437-
public ilist_half_embedded_sentinel_traits<::swift::SILInstruction> {};
5438-
54395434
template <>
54405435
struct ilist_traits<::swift::SILInstruction> :
54415436
public ilist_default_traits<::swift::SILInstruction> {

include/swift/SIL/SILVTable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ class SILVTable : public llvm::ilist_node<SILVTable>,
113113

114114
namespace llvm {
115115

116-
template <>
117-
struct ilist_sentinel_traits<::swift::SILVTable> :
118-
public ilist_half_embedded_sentinel_traits<::swift::SILVTable> {};
119-
120116
template <>
121117
struct ilist_traits<::swift::SILVTable> :
122118
public ilist_default_traits<::swift::SILVTable> {

include/swift/SIL/SILWitnessTable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,6 @@ class SILWitnessTable : public llvm::ilist_node<SILWitnessTable>,
281281

282282
namespace llvm {
283283

284-
template <>
285-
struct ilist_sentinel_traits<::swift::SILWitnessTable> :
286-
public ilist_half_embedded_sentinel_traits<::swift::SILWitnessTable> {};
287-
288284
template <>
289285
struct ilist_traits<::swift::SILWitnessTable> :
290286
public ilist_default_traits<::swift::SILWitnessTable> {

lib/Sema/Constraint.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,6 @@ class Constraint final : public llvm::ilist_node<Constraint>,
582582
namespace llvm {
583583

584584
/// Specialization of \c ilist_traits for constraints.
585-
template<>
586-
struct ilist_sentinel_traits<swift::constraints::Constraint>
587-
: public ilist_half_embedded_sentinel_traits<swift::constraints::Constraint> {};
588-
589585
template<>
590586
struct ilist_traits<swift::constraints::Constraint>
591587
: public ilist_default_traits<swift::constraints::Constraint> {

0 commit comments

Comments
 (0)