Merge remote-tracking branch 'origin/master' into master-next

Author: bob-wilson

docs/ARCOptimization.rst

@@ -232,7 +232,8 @@ this is true. The rule for conversions is that a conversion that preserves RC
 identity must have the following properties:
 
 1. Both of its arguments must be non-trivial values with the same ownership
-   semantics (i.e. unowned, strong, weak). This means that conversions such as:
+   semantics (i.e. unowned, strong, weak). This means that the following
+   conversions do not propagate RC identity:
 
    - address_to_pointer
    - pointer_to_address

include/swift/AST/AnyFunctionRef.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_AST_ANY_FUNCTION_REF_H
 #define SWIFT_AST_ANY_FUNCTION_REF_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
@@ -151,7 +152,7 @@ class AnyFunctionRef {
   }
 
 // Disable "only for use within the debugger" warning.
-#if defined(_MSC_VER)
+#if SWIFT_COMPILER_IS_MSVC
 #pragma warning(push)
 #pragma warning(disable: 4996)
 #endif
@@ -176,7 +177,7 @@ class AnyFunctionRef {
     llvm_unreachable("unexpected AnyFunctionRef representation");
   }
 };
-#if defined(_MSC_VER)
+#if SWIFT_COMPILER_IS_MSVC
 #pragma warning(pop)
 #endif
 

include/swift/AST/Decl.h

@@ -28,6 +28,7 @@
 #include "swift/AST/LazyResolver.h"
 #include "swift/AST/TypeAlignments.h"
 #include "swift/AST/Witness.h"
+#include "swift/Basic/Compiler.h"
 #include "swift/Basic/OptionalEnum.h"
 #include "swift/Basic/Range.h"
 #include "llvm/ADT/DenseMap.h"
@@ -864,11 +865,7 @@ class alignas(1 << DeclAlignInBits) Decl {
 
   // Make vanilla new/delete illegal for Decls.
   void *operator new(size_t Bytes) = delete;
-
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *Data) = delete;
-#endif
+  void operator delete(void *Data) SWIFT_DELETE_OPERATOR_DELETED;
 
   // Only allow allocation of Decls using the allocator in ASTContext
   // or by doing a placement new.

include/swift/AST/DiagnosticsSema.def

@@ -3318,7 +3318,7 @@ WARNING(discardable_result_on_void_never_function, none,
 
 ERROR(versioned_attr_with_explicit_accessibility,
       none, "'@_versioned' attribute can only be applied to internal "
-      "declarations, but %0 is %select{private|fileprivate|%error|public}1",
+      "declarations, but %0 is %select{private|fileprivate|%error|public|open}1",
       (Identifier, Accessibility))
 
 #define FRAGILE_FUNC_KIND \
@@ -3332,7 +3332,7 @@ ERROR(local_type_in_inlineable_function,
       (DeclName, unsigned))
 
 ERROR(resilience_decl_unavailable,
-      none, "%0 %1 is %select{private|fileprivate|internal|%error}2 and "
+      none, "%0 %1 is %select{private|fileprivate|internal|%error|%error}2 and "
       "cannot be referenced from " FRAGILE_FUNC_KIND "3",
       (DescriptiveDeclKind, DeclName, Accessibility, unsigned))
 

include/swift/AST/GenericEnvironment.h

@@ -20,7 +20,9 @@
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/AST/GenericParamKey.h"
 #include "swift/AST/GenericSignature.h"
+#include "swift/Basic/Compiler.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/TrailingObjects.h"
 #include <utility>
 
@@ -183,9 +185,7 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
 
   /// Make vanilla new/delete illegal.
   void *operator new(size_t Bytes) = delete;
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *Data) = delete;
-#endif
+  void operator delete(void *Data) SWIFT_DELETE_OPERATOR_DELETED;
 
   /// Only allow placement new.
   void *operator new(size_t Bytes, void *Mem) {

include/swift/AST/Module.h

@@ -23,6 +23,7 @@
 #include "swift/AST/LookupKinds.h"
 #include "swift/AST/RawComment.h"
 #include "swift/AST/Type.h"
+#include "swift/Basic/Compiler.h"
 #include "swift/Basic/OptionSet.h"
 #include "swift/Basic/SourceLoc.h"
 #include "swift/Basic/STLExtras.h"
@@ -506,11 +507,7 @@ class ModuleDecl : public TypeDecl, public DeclContext {
 private:
   // Make placement new and vanilla new/delete illegal for Modules.
   void *operator new(size_t Bytes) throw() = delete;
-
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) && !defined(__clang__)
-  void operator delete(void *Data) throw() = delete;
-#endif
+  void operator delete(void *Data) throw() SWIFT_DELETE_OPERATOR_DELETED;
   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

@@ -24,6 +24,7 @@
 #include "swift/AST/Types.h"
 #include "swift/AST/TypeAlignments.h"
 #include "swift/AST/Witness.h"
+#include "swift/Basic/Compiler.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
@@ -265,11 +266,7 @@ class alignas(1 << DeclAlignInBits) ProtocolConformance {
 
   // Make vanilla new/delete illegal for protocol conformances.
   void *operator new(size_t bytes) = delete;
-
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *data) = delete;
-#endif
+  void operator delete(void *data) SWIFT_DELETE_OPERATOR_DELETED;
 
   // Only allow allocation of protocol conformances using the allocator in
   // ASTContext or by doing a placement new.

include/swift/AST/TypeRepr.h

@@ -42,10 +42,7 @@ enum class TypeReprKind : uint8_t {
 
 /// \brief Representation of a type as written in source.
 class alignas(8) TypeRepr {
-  // Fix MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
   TypeRepr(const TypeRepr&) = delete;
-#endif
   void operator=(const TypeRepr&) = delete;
 
   class TypeReprBitfields {

include/swift/Basic/Compiler.h

@@ -0,0 +1,31 @@
+//===--- Compiler.h - Compiler specific definitions -------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_BASIC_COMPILER_H
+#define SWIFT_BASIC_COMPILER_H
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#define SWIFT_COMPILER_IS_MSVC 1
+#else
+#define SWIFT_COMPILER_IS_MSVC 0
+#endif
+
+#if SWIFT_COMPILER_IS_MSVC
+// 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
+
+#endif // SWIFT_BASIC_COMPILER_H

include/swift/Basic/EncodedSequence.h

@@ -21,6 +21,7 @@
 #ifndef SWIFT_BASIC_ENCODEDSEQUENCE_H
 #define SWIFT_BASIC_ENCODEDSEQUENCE_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/PrefixMap.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -339,7 +340,7 @@ class EncodedSequence : public EncodedSequenceBase {
   template <class ValueType> class Map {
     // Hack: MSVC isn't able to resolve the InlineKeyCapacity part of the
     // template of PrefixMap, so we have to split it up and pass it manually.
-#if defined(_MSC_VER) && !defined(__clang__)
+#if SWIFT_COMPILER_IS_MSVC
     static const size_t Size = (sizeof(void*) - 1) / sizeof(Chunk);
     static const size_t ActualSize = max<size_t>(Size, 1);
 

include/swift/Basic/type_traits.h

@@ -14,6 +14,7 @@
 #define SWIFT_BASIC_TYPETRAITS_H
 
 #include <type_traits>
+#include "swift/Basic/Compiler.h"
 
 #ifndef __has_feature
 #define SWIFT_DEFINED_HAS_FEATURE
@@ -29,8 +30,8 @@ namespace swift {
 /// is not intended to be specialized.
 template<typename T>
 struct IsTriviallyCopyable {
-#if _LIBCPP_VERSION || (defined(_MSC_VER) && !defined(__clang__))
-  // libc++ implements it.
+#if _LIBCPP_VERSION || SWIFT_COMPILER_IS_MSVC
+  // libc++ and MSVC implement is_trivially_copyable.
   static const bool value = std::is_trivially_copyable<T>::value;
 #elif __has_feature(is_trivially_copyable)
   static const bool value = __is_trivially_copyable(T);
@@ -41,8 +42,8 @@ struct IsTriviallyCopyable {
 
 template<typename T>
 struct IsTriviallyConstructible {
-#if _LIBCPP_VERSION || (defined(_MSC_VER) && !defined(__clang__))
-  // libc++ implements it.
+#if _LIBCPP_VERSION || SWIFT_COMPILER_IS_MSVC
+  // libc++ and MSVC implement is_trivially_constructible.
   static const bool value = std::is_trivially_constructible<T>::value;
 #elif __has_feature(has_trivial_constructor)
   static const bool value = __has_trivial_constructor(T);
@@ -53,8 +54,8 @@ struct IsTriviallyConstructible {
 
 template<typename T>
 struct IsTriviallyDestructible {
-#if _LIBCPP_VERSION || (defined(_MSC_VER) && !defined(__clang__))
-  // libc++ implements it.
+#if _LIBCPP_VERSION || SWIFT_COMPILER_IS_MSVC
+  // libc++ and MSVC implement is_trivially_destructible.
   static const bool value = std::is_trivially_destructible<T>::value;
 #elif __has_feature(has_trivial_destructor)
   static const bool value = __has_trivial_destructor(T);

include/swift/SIL/SILAllocated.h

@@ -14,6 +14,8 @@
 #define SWIFT_SIL_SILALLOCATED_H
 
 #include "swift/Basic/LLVM.h"
+#include "swift/Basic/Compiler.h"
+#include "llvm/Support/ErrorHandling.h"
 #include <stddef.h>
 
 namespace swift {
@@ -28,11 +30,8 @@ class SILAllocated {
   void *operator new(size_t) = delete;
   void *operator new[](size_t) = delete;
 
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
   /// Disable non-placement delete.
-  void operator delete(void *) = delete;
-#endif
+  void operator delete(void *) SWIFT_DELETE_OPERATOR_DELETED;
   void operator delete[](void *) = delete;
 
   /// Custom version of 'new' that uses the SILModule's BumpPtrAllocator with

include/swift/SIL/SILArgument.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_SIL_SILARGUMENT_H
 #define SWIFT_SIL_SILARGUMENT_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/SIL/SILArgumentConvention.h"
 #include "swift/SIL/SILFunction.h"
 #include "swift/SIL/SILValue.h"
@@ -36,11 +37,7 @@ SILFunctionType::getSILArgumentConvention(unsigned index) const {
 
 class SILArgument : public ValueBase {
   void operator=(const SILArgument &) = delete;
-
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *Ptr, size_t) = delete;
-#endif
+  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
 
   SILBasicBlock *ParentBB;
   const ValueDecl *Decl;

include/swift/SIL/SILBasicBlock.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_SIL_BASICBLOCK_H
 #define SWIFT_SIL_BASICBLOCK_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/Basic/Range.h"
 #include "swift/Basic/TransformArrayRef.h"
 #include "swift/SIL/SILInstruction.h"
@@ -53,10 +54,7 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   SILBasicBlock() : Parent(nullptr) {}
   void operator=(const SILBasicBlock &) = delete;
 
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *Ptr, size_t) = delete;
-#endif
+  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
 
   SILBasicBlock(SILFunction *F, SILBasicBlock *afterBB = nullptr);
 

include/swift/SIL/SILInstruction.h

@@ -19,6 +19,7 @@
 
 #include "swift/AST/Builtins.h"
 #include "swift/AST/ProtocolConformanceRef.h"
+#include "swift/Basic/Compiler.h"
 #include "swift/SIL/Consumption.h"
 #include "swift/SIL/SILAllocated.h"
 #include "swift/SIL/SILArgumentConvention.h"
@@ -80,11 +81,7 @@ class SILInstruction : public ValueBase,public llvm::ilist_node<SILInstruction>{
 
   SILInstruction() = delete;
   void operator=(const SILInstruction &) = delete;
-
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *Ptr, size_t) = delete;
-#endif
+  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
 
   /// Check any special state of instructions that are not represented in the
   /// instructions operands/type.

include/swift/SIL/SILOpenedArchetypesTracker.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_SIL_SILOPENEDARCHETYPESTRACKER_H
 #define SWIFT_SIL_SILOPENEDARCHETYPESTRACKER_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/SIL/Notifications.h"
 #include "swift/SIL/SILModule.h"
 #include "swift/SIL/SILFunction.h"
@@ -21,7 +22,8 @@
 namespace swift {
 
 // Disable MSVC warning: multiple copy constructors specified.
-#if defined(_MSC_VER)
+// TODO: silence this warning.
+#if SWIFT_COMPILER_IS_MSVC
 #pragma warning(push)
 #pragma warning(disable: 4521)
 #endif
@@ -134,7 +136,7 @@ class SILOpenedArchetypesTracker : public DeleteNotificationHandler {
   OpenedArchetypeDefsMap LocalOpenedArchetypeDefs;
 };
 
-#if defined(_MSC_VER)
+#if SWIFT_COMPILER_IS_MSVC
 #pragma warning(pop)
 #endif
 

include/swift/SIL/SILUndef.h

@@ -13,18 +13,15 @@
 #ifndef SWIFT_SIL_UNDEF_H
 #define SWIFT_SIL_UNDEF_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/SIL/SILValue.h"
 
 namespace swift {
   class SILModule;
 
 class SILUndef : public ValueBase {
   void operator=(const SILArgument &) = delete;
-
-  // Work around MSVC error: attempting to reference a deleted function.
-#if !defined(_MSC_VER) || defined(__clang__)
-  void operator delete(void *Ptr, size_t) = delete;
-#endif
+  void operator delete(void *Ptr, size_t) SWIFT_DELETE_OPERATOR_DELETED
 
   SILUndef(SILType Ty) : ValueBase(ValueKind::SILUndef, Ty) {}
 public:

lib/AST/ASTContext.cpp

@@ -31,6 +31,7 @@
 #include "swift/AST/RawComment.h"
 #include "swift/AST/SILLayout.h"
 #include "swift/AST/TypeCheckerDebugConsumer.h"
+#include "swift/Basic/Compiler.h"
 #include "swift/Basic/Fallthrough.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/StringExtras.h"
@@ -277,12 +278,12 @@ struct ASTContext::Implementation {
         conformance.~SpecializedProtocolConformance();
       // Work around MSVC warning: local variable is initialized but
       // not referenced.
-#if defined(_MSC_VER)
+#if SWIFT_COMPILER_IS_MSVC
 #pragma warning (disable: 4189)
 #endif
       for (auto &conformance : InheritedConformances)
         conformance.~InheritedProtocolConformance();
-#if defined(_MSC_VER)
+#if SWIFT_COMPILER_IS_MSVC
 #pragma warning (default: 4189)
 #endif