Merge remote-tracking branch 'apple/main' into katei/merge-main-2021-02-03

Author: kateinoigakukun

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -97,6 +97,10 @@ macro(swift_common_standalone_build_config_llvm product)
     endif()
   endif()
 
+  if(LLVM_ENABLE_ZLIB)
+   find_package(ZLIB REQUIRED)
+  endif()
+
   include(AddLLVM)
   include(AddSwiftTableGen) # This imports TableGen from LLVM.
   include(HandleLLVMOptions)

docs/Testing.md

@@ -199,16 +199,16 @@ For every target above, there are variants for different optimizations:
 * the target with ``-optimize`` suffix (e.g., ``check-swift-optimize``) -- runs
   execution tests in ``-O`` mode.  This target will only run tests marked as
   ``executable_test``.
-* the target with ``-optimize-unchecked`` suffix (e.g.,
-  ``check-swift-optimize-unchecked``) -- runs execution tests in
+* the target with ``-optimize_unchecked`` suffix (e.g.,
+  ``check-swift-optimize_unchecked``) -- runs execution tests in
   ``-Ounchecked`` mode. This target will only run tests marked as
   ``executable_test``.
-* the target with ``-executable`` suffix (e.g.,
-  ``check-swift-executable-iphoneos-arm64``) -- runs tests marked with
-  ``executable_test`` in ``-Onone`` mode.
-* the target with ``-non-executable`` suffix (e.g.,
-  ``check-swift-non-executable-iphoneos-arm64``) -- runs tests not marked with
+* the target with ``-only_executable`` suffix (e.g.,
+  ``check-swift-only_executable-iphoneos-arm64``) -- runs tests marked with
   ``executable_test`` in ``-Onone`` mode.
+* the target with ``-only_non_executable`` suffix (e.g.,
+  ``check-swift-only_non_executable-iphoneos-arm64``) -- runs tests not marked
+  with ``executable_test`` in ``-Onone`` mode.
 
 ### Writing tests
 

include/swift/ABI/TrailingObjects.h

@@ -56,7 +56,6 @@
 #define SWIFT_ABI_TRAILINGOBJECTS_H
 
 #include "llvm/Support/Alignment.h"
-#include "llvm/Support/AlignOf.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/type_traits.h"

include/swift/AST/DiagnosticsSema.def

@@ -4169,8 +4169,8 @@ ERROR(actor_isolated_objc,none,
       "actor-isolated %0 %1 cannot be @objc",
        (DescriptiveDeclKind, DeclName))
 NOTE(protocol_witness_async_conflict,none,
-     "candidate is %select{not |}0'async', but protocol requirement is%select{| not}0",
-     (bool))
+     "candidate is %select{not |}0'async', but%select{| @objc}1 protocol requirement is%select{| not}0",
+     (bool, bool))
 ERROR(async_autoclosure_nonasync_function,none,
       "'async' autoclosure parameter in a non-'async' function", ())
 
@@ -4218,9 +4218,6 @@ ERROR(objc_ambiguous_async_convention,none,
 NOTE(objc_ambiguous_async_convention_candidate,none,
      "%0 provides async here", (DeclName))
 
-ERROR(satisfy_async_objc,none,
-      "satisfying an asychronous @objc %select{method|initializer}0 with "
-      "a synchronous %select{method|initializer}0 is not supported", (bool))
 ERROR(async_objc_dynamic_self,none,
       "asynchronous method returning 'Self' cannot be '@objc'", ())
 

include/swift/AST/FineGrainedDependencyFormat.h

@@ -13,7 +13,7 @@
 #ifndef SWIFT_AST_FINEGRAINEDDEPENDENCYFORMAT_H
 #define SWIFT_AST_FINEGRAINEDDEPENDENCYFORMAT_H
 
-#include "llvm/Bitcode/RecordLayout.h"
+#include "llvm/Bitcode/BitcodeConvenience.h"
 #include "llvm/Bitstream/BitCodes.h"
 
 namespace llvm {

include/swift/Basic/AnyValue.h

@@ -30,14 +30,6 @@ namespace llvm {
     return hash_value(ptr.getOpaqueValue());
   }
 
-  // FIXME: Belongs in LLVM itself
-  template<typename T>
-  hash_code hash_value(const llvm::Optional<T> &opt) {
-    if (!opt)
-      return 1;
-    return hash_value(*opt);
-  }
-
   template<typename T>
   bool operator==(const TinyPtrVector<T> &lhs, const TinyPtrVector<T> &rhs) {
     if (lhs.size() != rhs.size())

include/swift/Basic/DiagnosticOptions.h

@@ -41,6 +41,10 @@ class DiagnosticOptions {
   /// Indicates whether diagnostic passes should be skipped.
   bool SkipDiagnosticPasses = false;
 
+  /// Additional non-source files which will have diagnostics emitted in them,
+  /// and which should be scanned for expectations by the diagnostic verifier.
+  std::vector<std::string> AdditionalVerifierFiles;
+
   /// Keep emitting subsequent diagnostics after a fatal error.
   bool ShowDiagnosticsAfterFatalError = false;
 
@@ -54,22 +58,23 @@ class DiagnosticOptions {
   /// Treat all warnings as errors
   bool WarningsAsErrors = false;
 
-  // When printing diagnostics, include the diagnostic name at the end
+  /// When printing diagnostics, include the diagnostic name (diag::whatever) at
+  /// the end.
   bool PrintDiagnosticNames = false;
 
   /// If set to true, include educational notes in printed output if available.
   /// Educational notes are documentation which supplement diagnostics.
   bool PrintEducationalNotes = false;
 
-  // If set to true, use the more descriptive experimental formatting style for
-  // diagnostics.
+  /// Whether to emit diagnostics in the terse LLVM style or in a more
+  /// descriptive style that's specific to Swift (currently experimental).
   FormattingStyle PrintedFormattingStyle = FormattingStyle::LLVM;
 
   std::string DiagnosticDocumentationPath = "";
 
   std::string LocalizationCode = "";
 
-  // Diagnostic messages directory path.
+  /// Path to a directory of diagnostic localization tables.
   std::string LocalizationPath = "";
 
   /// Return a hash code of any components from these options that should

include/swift/ClangImporter/SwiftAbstractBasicWriter.h

@@ -44,6 +44,8 @@ class DataStreamBasicWriter
 public:
   using super::asImpl;
 
+  DataStreamBasicWriter(clang::ASTContext &ctx) : super(ctx) {}
+
   /// Perform all the calls necessary to write out the given type.
   void writeTypeRef(const clang::Type *type) {
     asImpl().writeUInt64(uint64_t(type->getTypeClass()));

include/swift/Driver/Action.h

@@ -397,7 +397,7 @@ class StaticLinkJobAction : public JobAction {
 };
 
 class VerifyModuleInterfaceJobAction : public JobAction {
-  virtual void anchor();
+  virtual void anchor() override;
   file_types::ID inputType;
 
 public:

include/swift/Frontend/DiagnosticVerifier.h

@@ -65,6 +65,7 @@ class DiagnosticVerifier : public DiagnosticConsumer {
   SourceManager &SM;
   std::vector<CapturedDiagnosticInfo> CapturedDiagnostics;
   ArrayRef<unsigned> BufferIDs;
+  SmallVector<unsigned, 4> AdditionalBufferIDs;
   bool AutoApplyFixes;
   bool IgnoreUnknown;
 
@@ -74,6 +75,10 @@ class DiagnosticVerifier : public DiagnosticConsumer {
       : SM(SM), BufferIDs(BufferIDs), AutoApplyFixes(AutoApplyFixes),
         IgnoreUnknown(IgnoreUnknown) {}
 
+  void appendAdditionalBufferID(unsigned bufferID) {
+    AdditionalBufferIDs.push_back(bufferID);
+  }
+
   virtual void handleDiagnostic(SourceManager &SM,
                                 const DiagnosticInfo &Info) override;