Merge pull request swiftlang#28936 from compnerd/party-like-its-2017

remove VS2015 workaround (NFC)

Author: compnerd

include/swift/AST/Decl.h

@@ -927,7 +927,7 @@ class alignas(1 << DeclAlignInBits) Decl {
 
   // Make vanilla new/delete illegal for Decls.
   void *operator new(size_t Bytes) = delete;
-  void operator delete(void *Data) SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *Data) = delete;
 
   // Only allow allocation of Decls using the allocator in ASTContext
   // or by doing a placement new.

include/swift/AST/GenericEnvironment.h

@@ -109,7 +109,7 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
 
   /// Make vanilla new/delete illegal.
   void *operator new(size_t Bytes) = delete;
-  void operator delete(void *Data) SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *Data) = delete;
 
   /// Only allow placement new.
   void *operator new(size_t Bytes, void *Mem) {

include/swift/AST/Module.h

@@ -582,7 +582,7 @@ class ModuleDecl : public DeclContext, public TypeDecl {
 private:
   // Make placement new and vanilla new/delete illegal for Modules.
   void *operator new(size_t Bytes) throw() = delete;
-  void operator delete(void *Data) throw() SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *Data) throw() = delete;
   void *operator new(size_t Bytes, void *Mem) throw() = delete;
 public:
   // Only allow allocation of Modules using the allocator in ASTContext

include/swift/AST/ProtocolConformance.h

@@ -285,7 +285,7 @@ class alignas(1 << DeclAlignInBits) ProtocolConformance {
 
   // Make vanilla new/delete illegal for protocol conformances.
   void *operator new(size_t bytes) = delete;
-  void operator delete(void *data) SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *data) = delete;
 
   // Only allow allocation of protocol conformances using the allocator in
   // ASTContext or by doing a placement new.

include/swift/Basic/Compiler.h

@@ -27,15 +27,6 @@
 #define __has_attribute(x) 0
 #endif
 
-#if SWIFT_COMPILER_IS_MSVC && _MSC_VER < 1910
-// Work around MSVC bug: attempting to reference a deleted function
-// https://connect.microsoft.com/VisualStudio/feedback/details/3116505
-#define SWIFT_DELETE_OPERATOR_DELETED                                          \
-  { llvm_unreachable("Delete operator should not be called."); }
-#else
-#define SWIFT_DELETE_OPERATOR_DELETED = delete;
-#endif
-
 // __builtin_assume() is an optimization hint.
 #if __has_builtin(__builtin_assume)
 #define SWIFT_ASSUME(x) __builtin_assume(x)

include/swift/SIL/SILAllocated.h

@@ -31,7 +31,7 @@ class SILAllocated {
   void *operator new[](size_t) = delete;
 
   /// Disable non-placement delete.
-  void operator delete(void *) SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *) = delete;
   void operator delete[](void *) = delete;
 
   /// Custom version of 'new' that uses the SILModule's BumpPtrAllocator with

include/swift/SIL/SILArgument.h

@@ -89,7 +89,7 @@ class SILArgument : public ValueBase {
 
 public:
   void operator=(const SILArgument &) = delete;
-  void operator delete(void *, size_t) SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *, size_t) = delete;
 
   ValueOwnershipKind getOwnershipKind() const {
     return static_cast<ValueOwnershipKind>(Bits.SILArgument.VOKind);

include/swift/SIL/SILBasicBlock.h

@@ -54,7 +54,7 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   SILBasicBlock() : Parent(nullptr) {}
   void operator=(const SILBasicBlock &) = delete;
 
-  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
+  void operator delete(void *Ptr, size_t) = delete;
 
   SILBasicBlock(SILFunction *F, SILBasicBlock *relativeToBB, bool after);
 

include/swift/SIL/SILInstruction.h

@@ -318,7 +318,7 @@ class SILInstruction
 
   SILInstruction() = delete;
   void operator=(const SILInstruction &) = delete;
-  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
+  void operator delete(void *Ptr, size_t) = delete;
 
   /// Check any special state of instructions that are not represented in the
   /// instructions operands/type.
@@ -799,7 +799,7 @@ class SingleValueInstruction : public SILInstruction, public ValueBase {
   SILModule &getModule() const { return SILInstruction::getModule(); }
   SILInstructionKind getKind() const { return SILInstruction::getKind(); }
 
-  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
+  void operator delete(void *Ptr, size_t) = delete;
 
   ValueKind getValueKind() const {
     return ValueBase::getKind();
@@ -950,7 +950,7 @@ class MultipleValueInstruction : public SILInstruction {
       : SILInstruction(kind, loc) {}
 
 public:
-  void operator delete(void *Ptr, size_t)SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *Ptr, size_t) = delete;
 
   MultipleValueInstruction *clone(SILInstruction *insertPt = nullptr) {
     return cast<MultipleValueInstruction>(SILInstruction::clone(insertPt));

include/swift/SIL/SILUndef.h

@@ -29,7 +29,7 @@ class SILUndef : public ValueBase {
 
 public:
   void operator=(const SILArgument &) = delete;
-  void operator delete(void *, size_t) SWIFT_DELETE_OPERATOR_DELETED;
+  void operator delete(void *, size_t) = delete;
 
   static SILUndef *get(SILType ty, SILModule &m, ValueOwnershipKind ownershipKind);
   static SILUndef *get(SILType ty, const SILFunction &f);