Merge branch 'master' of https://github.com/apple/swift into swift5-verison

# Conflicts:
#	test/api-digester/Outputs/stability-stdlib-source.swift.expected

Author: tkremenek

benchmark/utils/TestsUtils.swift

@@ -221,6 +221,7 @@ public func Random() -> Int64 {
   return lfsrRandomGenerator.randInt()
 }
 
+@inlinable // FIXME(inline-always)
 @inline(__always)
 public func CheckResults(
     _ resultsMatch: Bool,

cmake/modules/SwiftComponents.cmake

@@ -56,7 +56,6 @@
 # * stdlib -- the Swift standard library.
 # * stdlib-experimental -- the Swift standard library module for experimental
 #   APIs.
-# * swift-syntax -- the Swift module for the libSyntax Swift API
 # * sdk-overlay -- the Swift SDK overlay.
 # * editor-integration -- scripts for Swift integration in IDEs other than
 #   Xcode;
@@ -66,7 +65,7 @@
 # * toolchain-dev-tools -- install development tools useful in a shared toolchain
 # * dev -- headers and libraries required to use Swift compiler as a library.
 set(_SWIFT_DEFINED_COMPONENTS
-  "autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;swift-syntax;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
+  "autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
 
 macro(swift_configure_components)
   # Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D

cmake/modules/SwiftSource.cmake

@@ -243,6 +243,7 @@ function(_compile_swift_files
 
   if(SWIFTFILE_IS_STDLIB)
     list(APPEND swift_flags "-Xfrontend" "-enable-sil-ownership")
+    list(APPEND swift_flags "-Xfrontend" "-enable-mandatory-semantic-arc-opts")
   endif()
 
   if(NOT SWIFT_ENABLE_STDLIBCORE_EXCLUSIVITY_CHECKING AND SWIFTFILE_IS_STDLIB)

docs/ABI/Mangling.rst

@@ -195,8 +195,8 @@ types where the metadata itself has unknown layout.)
   global ::= protocol 'TL'               // protocol requirements base descriptor
   global ::= assoc-type-name 'Tl'        // associated type descriptor
   global ::= assoc-type-name 'TM'        // default associated type witness accessor (HISTORICAL)
-  global ::= type assoc-type-path protocol 'Tn' // associated conformance descriptor
-  global ::= type assoc-type-path protocol 'TN' // default associated conformance witness accessor
+  global ::= type assoc-type-list protocol 'Tn' // associated conformance descriptor
+  global ::= type assoc-type-list protocol 'TN' // default associated conformance witness accessor
 
   REABSTRACT-THUNK-TYPE ::= 'R'          // reabstraction thunk helper function
   REABSTRACT-THUNK-TYPE ::= 'r'          // reabstraction thunk

include/swift/ABI/Enum.h

@@ -0,0 +1,53 @@
+//===--- Enum.h - Enum implementation runtime declarations ------*- 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
+//
+//===----------------------------------------------------------------------===//
+//
+// Enum implementation details declarations relevant to the ABI.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_ABI_ENUM_H
+#define SWIFT_ABI_ENUM_H
+
+#include <stdlib.h>
+
+namespace swift {
+
+struct EnumTagCounts {
+  unsigned numTags, numTagBytes;
+};
+
+inline EnumTagCounts
+getEnumTagCounts(size_t size, unsigned emptyCases, unsigned payloadCases) {
+  // We can use the payload area with a tag bit set somewhere outside of the
+  // payload area to represent cases. See how many bytes we need to cover
+  // all the empty cases.
+  unsigned numTags = payloadCases;
+  if (emptyCases > 0) {
+    if (size >= 4)
+      // Assume that one tag bit is enough if the precise calculation overflows
+      // an int32.
+      numTags += 1;
+    else {
+      unsigned bits = size * 8U;
+      unsigned casesPerTagBitValue = 1U << bits;
+      numTags += ((emptyCases + (casesPerTagBitValue-1U)) >> bits);
+    }
+  }
+  unsigned numTagBytes = (numTags <=    1 ? 0 :
+                          numTags <   256 ? 1 :
+                          numTags < 65536 ? 2 : 4);
+  return {numTags, numTagBytes};
+}
+
+} // namespace swift
+
+#endif // SWIFT_ABI_ENUM_H

include/swift/AST/Attr.def

@@ -179,7 +179,7 @@ SIMPLE_DECL_ATTR(unsafe_no_objc_tagged_pointer, UnsafeNoObjCTaggedPointer,
   UserInaccessible,
   19)
 DECL_ATTR(inline, Inline,
-  OnFunc | OnAccessor | OnConstructor,
+  OnVar | OnSubscript | OnAbstractFunction,
   20)
 DECL_ATTR(_semantics, Semantics,
   OnAbstractFunction | OnSubscript |

include/swift/AST/Decl.h

@@ -570,7 +570,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasAnyUnavailableValues : 1
   );
 
-  SWIFT_INLINE_BITFIELD(ModuleDecl, TypeDecl, 1+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(ModuleDecl, TypeDecl, 1+1+1+1+1+1,
     /// If the module was or is being compiled with `-enable-testing`.
     TestingEnabled : 1,
 
@@ -586,7 +586,10 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasResolvedImports : 1,
 
     // If the module was or is being compiled with `-enable-private-imports`.
-    PrivateImportsEnabled : 1
+    PrivateImportsEnabled : 1,
+
+    // If the module is compiled with `-enable-implicit-dynamic`.
+    ImplicitDynamicEnabled : 1
   );
 
   SWIFT_INLINE_BITFIELD(PrecedenceGroupDecl, Decl, 1+2,
@@ -2594,6 +2597,10 @@ class ValueDecl : public Decl {
     return isObjC() && isDynamic();
   }
 
+  bool isNativeDynamic() const {
+    return !isObjC() && isDynamic();
+  }
+
   /// Set whether this type is 'dynamic' or not.
   void setIsDynamic(bool value);
 

include/swift/AST/DiagnosticConsumer.h

@@ -25,6 +25,7 @@
 
 namespace swift {
   class DiagnosticArgument;
+  class DiagnosticEngine;
   class SourceManager;
   enum class DiagID : uint32_t;
 
@@ -122,6 +123,19 @@ class NullDiagnosticConsumer : public DiagnosticConsumer {
                         const DiagnosticInfo &Info) override;
 };
 
+/// \brief DiagnosticConsumer that forwards diagnostics to the consumers of
+// another DiagnosticEngine.
+class ForwardingDiagnosticConsumer : public DiagnosticConsumer {
+  DiagnosticEngine &TargetEngine;
+public:
+  ForwardingDiagnosticConsumer(DiagnosticEngine &Target);
+  void handleDiagnostic(SourceManager &SM, SourceLoc Loc,
+                        DiagnosticKind Kind,
+                        StringRef FormatString,
+                        ArrayRef<DiagnosticArgument> FormatArgs,
+                        const DiagnosticInfo &Info) override;
+};
+
 /// \brief DiagnosticConsumer that funnels diagnostics in certain files to
 /// particular sub-consumers.
 ///

include/swift/AST/DiagnosticEngine.h

@@ -604,6 +604,11 @@ namespace swift {
       return Result;
     }
 
+    /// \brief Return all \c DiagnosticConsumers.
+    ArrayRef<DiagnosticConsumer *> getConsumers() {
+      return Consumers;
+    }
+
     /// \brief Emit a diagnostic using a preformatted array of diagnostic
     /// arguments.
     ///

include/swift/AST/DiagnosticsFrontend.def

@@ -265,8 +265,17 @@ WARNING(parseable_interface_scoped_import_unsupported,none,
         ())
 ERROR(error_extracting_version_from_parseable_interface,none,
       "error extracting version from parseable module interface", ())
+ERROR(unsupported_version_of_parseable_interface,none,
+      "unsupported version of parseable module interface '%0': '%1'",
+      (StringRef, llvm::VersionTuple))
 ERROR(error_extracting_flags_from_parseable_interface,none,
       "error extracting flags from parseable module interface", ())
+ERROR(missing_dependency_of_parseable_module_interface,none,
+      "missing dependency '%0' of parseable module interface '%1': %2",
+      (StringRef, StringRef, StringRef))
+ERROR(error_extracting_dependencies_from_cached_module,none,
+      "error extracting dependencies from cached module '%0'",
+      (StringRef))
 
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)

include/swift/AST/DiagnosticsSema.def

@@ -4097,7 +4097,6 @@ ERROR(usable_from_inline_attr_in_protocol,none,
 
 #define FRAGILE_FUNC_KIND \
   "%select{a '@_transparent' function|" \
-  "an '@inline(__always)' function|" \
   "an '@inlinable' function|" \
   "a default argument value|" \
   "a property initializer in a '@_fixed_layout' type}"
@@ -4126,7 +4125,7 @@ NOTE(resilience_decl_declared_here,
 
 ERROR(class_designated_init_inlinable_resilient,none,
       "initializer for class %0 is "
-      "'%select{@_transparent|@inline(__always)|@inlinable|%error}1' and must "
+      "'%select{@_transparent|@inlinable|%error}1' and must "
       "delegate to another initializer", (Type, unsigned))
 
 ERROR(attribute_invalid_on_stored_property,

include/swift/AST/Module.h

@@ -283,6 +283,14 @@ class ModuleDecl : public DeclContext, public TypeDecl {
     Bits.ModuleDecl.TestingEnabled = enabled;
   }
 
+  // Returns true if this module is compiled with implicit dynamic.
+  bool isImplicitDynamicEnabled() const {
+    return Bits.ModuleDecl.ImplicitDynamicEnabled;
+  }
+  void setImplicitDynamicEnabled(bool enabled = true) {
+    Bits.ModuleDecl.ImplicitDynamicEnabled = enabled;
+  }
+
   /// Returns true if this module was or is begin compile with
   /// `-enable-private-imports`.
   bool arePrivateImportsEnabled() const {
@@ -990,7 +998,18 @@ class SourceFile final : public FileUnit {
 
   void addImports(ArrayRef<ImportedModuleDesc> IM);
 
-  bool hasTestableOrPrivateImport(AccessLevel accessLevel, const ValueDecl *ofDecl) const;
+  enum ImportQueryKind {
+    /// Return the results for testable or private imports.
+    TestableAndPrivate,
+    /// Return the results only for testable imports.
+    TestableOnly,
+    /// Return the results only for private imports.
+    PrivateOnly
+  };
+
+  bool
+  hasTestableOrPrivateImport(AccessLevel accessLevel, const ValueDecl *ofDecl,
+                             ImportQueryKind kind = TestableAndPrivate) const;
 
   void clearLookupCache();
 

include/swift/AST/ModuleLoader.h

@@ -63,17 +63,12 @@ class DependencyTracker {
 
 /// \brief Abstract interface that loads named modules into the AST.
 class ModuleLoader {
-  DependencyTracker * const dependencyTracker;
   virtual void anchor();
 
 protected:
+  DependencyTracker * const dependencyTracker;
   ModuleLoader(DependencyTracker *tracker) : dependencyTracker(tracker) {}
 
-  void addDependency(StringRef file, bool IsSystem=false) {
-    if (dependencyTracker)
-      dependencyTracker->addDependency(file, IsSystem);
-  }
-
 public:
   virtual ~ModuleLoader() = default;
 

include/swift/Basic/FileTypes.def

@@ -41,6 +41,7 @@ TYPE("sil",                 SIL,                       "sil",             "")
 TYPE("sib",                 SIB,                       "sib",             "")
 
 // Output types
+TYPE("ast-dump",            ASTDump,                   "ast",             "")
 TYPE("image",               Image,                     "out",             "")
 TYPE("object",              Object,                    "o",               "")
 TYPE("dSYM",                dSYM,                      "dSYM",            "")

include/swift/Basic/LangOptions.h

@@ -144,10 +144,6 @@ namespace swift {
     /// was not compiled with -enable-testing.
     bool EnableTestableAttrRequiresTestableModule = true;
 
-    /// If true, the 'dynamic' attribute is added to all applicable
-    /// declarations.
-    bool EnableImplicitDynamic = false;
-
     ///
     /// Flags for developers
     ///

include/swift/Basic/PrimarySpecificPaths.h

@@ -27,8 +27,9 @@ namespace swift {
 class PrimarySpecificPaths {
 public:
   /// The name of the main output file,
-  /// that is, the .o file for this input. If there is no such file, contains an
-  /// empty string. If the output is to be written to stdout, contains "-".
+  /// that is, the .o file for this input (or a file specified by -o).
+  /// If there is no such file, contains an empty string. If the output
+  /// is to be written to stdout, contains "-".
   std::string OutputFilename;
 
   SupplementaryOutputPaths SupplementaryOutputs;

include/swift/ClangImporter/ClangImporter.h

@@ -326,8 +326,6 @@ class ClangImporter final : public ClangModuleLoader {
   /// Writes the mangled name of \p clangDecl to \p os.
   void getMangledName(raw_ostream &os, const clang::NamedDecl *clangDecl) const;
 
-  using ClangModuleLoader::addDependency;
-
   // Print statistics from the Clang AST reader.
   void printStatistics() const override;
 

include/swift/Frontend/FrontendOptions.h

@@ -146,9 +146,10 @@ class FrontendOptions {
   /// Indicates that the input(s) should be parsed as the Swift stdlib.
   bool ParseStdlib = false;
 
-  /// If set, emitted module files will always contain options for the
-  /// debugger to use.
-  bool AlwaysSerializeDebuggingOptions = false;
+  /// When true, emitted module files will always contain options for the
+  /// debugger to use. When unset, the options will only be present if the
+  /// module appears to not be a public module.
+  Optional<bool> SerializeOptionsForDebugging;
 
   /// If set, inserts instrumentation useful for testing the debugger.
   bool DebuggerTestingTransform = false;
@@ -197,6 +198,12 @@ class FrontendOptions {
   /// \see ModuleDecl::arePrivateImportsEnabled
   bool EnablePrivateImports = false;
 
+
+  /// Indicates whether we add implicit dynamic.
+  ///
+  /// \see ModuleDecl::isImplicitDynamicEnabled
+  bool EnableImplicitDynamic = false;
+
   /// Enables the "fully resilient" resilience strategy.
   ///
   /// \see ResilienceStrategy::Resilient

include/swift/Frontend/ParseableInterfaceSupport.h

@@ -29,7 +29,7 @@ struct ParseableInterfaceOptions {
   std::string ParseableInterfaceFlags;
 };
 
-llvm::Regex getSwiftInterfaceToolsVersionRegex();
+llvm::Regex getSwiftInterfaceFormatVersionRegex();
 llvm::Regex getSwiftInterfaceModuleFlagsRegex();
 
 /// Emit a stable, parseable interface for \p M, which can be used by a client

include/swift/IDE/CodeCompletionCache.h

@@ -41,6 +41,7 @@ class CodeCompletionCache {
     std::vector<std::string> AccessPath;
     bool ResultsHaveLeadingDot;
     bool ForTestableLookup;
+    bool ForPrivateImportLookup;
     bool CodeCompleteInitsInPostfixExpr;
 
     friend bool operator==(const Key &LHS, const Key &RHS) {
@@ -49,6 +50,7 @@ class CodeCompletionCache {
         LHS.AccessPath == RHS.AccessPath &&
         LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
         LHS.ForTestableLookup == RHS.ForTestableLookup &&
+        LHS.ForPrivateImportLookup == RHS.ForPrivateImportLookup &&
         LHS.CodeCompleteInitsInPostfixExpr == RHS.CodeCompleteInitsInPostfixExpr;
     }
   };
@@ -106,10 +108,10 @@ template<>
 struct DenseMapInfo<swift::ide::CodeCompletionCache::Key> {
   using KeyTy = swift::ide::CodeCompletionCache::Key;
   static inline KeyTy getEmptyKey() {
-    return KeyTy{"", "", {}, false, false, false};
+    return KeyTy{"", "", {}, false, false, false, false};
   }
   static inline KeyTy getTombstoneKey() {
-    return KeyTy{"", "", {}, true, false, false};
+    return KeyTy{"", "", {}, true, false, false, false};
   }
   static unsigned getHashValue(const KeyTy &Val) {
     size_t H = 0;
@@ -119,6 +121,7 @@ struct DenseMapInfo<swift::ide::CodeCompletionCache::Key> {
       H ^= std::hash<std::string>()(Piece);
     H ^= std::hash<bool>()(Val.ResultsHaveLeadingDot);
     H ^= std::hash<bool>()(Val.ForTestableLookup);
+    H ^= std::hash<bool>()(Val.ForPrivateImportLookup);
     return static_cast<unsigned>(H);
   }
   static bool isEqual(const KeyTy &LHS, const KeyTy &RHS) {

include/swift/IRGen/Linking.h

@@ -1012,6 +1012,9 @@ struct IRLinkage {
   llvm::GlobalValue::LinkageTypes Linkage;
   llvm::GlobalValue::VisibilityTypes Visibility;
   llvm::GlobalValue::DLLStorageClassTypes DLLStorage;
+
+  static const IRLinkage InternalLinkOnceODR;
+  static const IRLinkage Internal;
 };
 
 class ApplyIRLinkage {