Merge branch 'main' of github.com:apple/swift into tensorflow-stage

* 'main' of github.com:apple/swift: (22 commits)
  Dynamic Casting: Properly unwrap existential metatype sources (swiftlang#34469)
  Add -allow-critical-edges=false to copyforward_ossa.sil
  Add -allow-critical-edges flag.
  Sema: Check result builder availability
  Sema: Pass ExportContext by const reference where possible
  Sema: Put the AvailabilityContext inside the ExportContext
  Change interfaces to accept a FileCollectorBase
  [Parse] Remove unused declaration and diagnostic message
  [cxx-interop] Use regex instead of operand name to fix C++ constructor tests.
  [CodeCompletion] Fix a crash in collectPossibleReturnTypesFromContext
  [test] Update cross_langauge index test for mangling change
  Temporarily disable this test
  [Concurrency] SIL: add hop_to_executor instruction
  sil-opt: add an -enable-experimental-concurrency option.
  Sema: Don't visit elements of a BraceStmt twice when checking availability
  Sema: Rename AvailabilityWalker to ExprAvailabilityWalker
  Sema: Pull diagnoseDeclAvailability() out of AvailabilityWalker
  Sema: Rename some availability checking entry points
  SILGen: Stub out support for invoking foreign async methods.
  Add a mangling for completion block implementation functions.
  ...

Author: ainu-bot

docs/ABI/Mangling.rst

@@ -218,6 +218,8 @@ types where the metadata itself has unknown layout.)
   global ::= global 'Tm'                 // merged function
   global ::= entity                      // some identifiable thing
   global ::= from-type to-type generic-signature? 'TR'  // reabstraction thunk
+  global ::= from-type to-type generic-signature? 'TR'  // reabstraction thunk
+  global ::= impl-function-type 'Tz'     // objc-to-swift-async completion handler block implementation
   global ::= from-type to-type self-type generic-signature? 'Ty'  // reabstraction thunk with dynamic 'Self' capture
   global ::= from-type to-type generic-signature? 'Tr'  // obsolete mangling for reabstraction thunk
   global ::= entity generic-signature? type type* 'TK' // key path getter

docs/SIL.rst

@@ -2885,6 +2885,27 @@ initialized with the resume value, and that value is then owned by the current
 function. If ``await_async_continuation`` instead resumes to its ``error``
 successor, then the memory remains uninitialized.
 
+hop_to_executor
+```````````````
+
+::
+
+  sil-instruction ::= 'hop_to_executor' sil-operand
+
+  hop_to_executor %0 : $T
+
+  // $T must conform to the Actor protocol
+
+Ensures that all instructions, which need to run on the actor's executor
+actually run on that executor.
+This instruction can only be used inside an ``@async`` function.
+
+Checks if the current executor is the one which is bound to the operand actor.
+If not, begins a suspension point and enqueues the continuation to the executor
+which is bound to the operand actor.
+
+The operand is a guaranteed operand, i.e. not consumed.
+
 dealloc_stack
 `````````````
 ::

include/swift/AST/DiagnosticsFrontend.def

@@ -156,7 +156,7 @@ ERROR(error_unable_to_load_supplementary_output_file_map, none,
 
 ERROR(error_missing_entry_in_supplementary_output_file_map, none,
       "supplementary output file map '%0' is missing an entry for '%1' "
-      "(this likely indicates a compiler issue; please file a bug report)",
+      "(this likely indicates a compiler issue; " SWIFT_BUG_REPORT_MESSAGE ")",
       (StringRef, StringRef))
 
 ERROR(error_repl_requires_no_input_files,none,
@@ -307,8 +307,8 @@ ERROR(symbol_in_ir_not_in_tbd,none,
       (StringRef, StringRef))
 
 ERROR(tbd_validation_failure,none,
-      "please file a radar or open a bug on bugs.swift.org with this code, and "
-      "add -Xfrontend -validate-tbd-against-ir=none to squash the errors", ())
+      SWIFT_BUG_REPORT_MESSAGE ", and add "
+      "'-Xfrontend -validate-tbd-against-ir=none' to squash the errors", ())
 
 ERROR(redundant_prefix_compilation_flag,none,
       "invalid argument '-D%0'; did you provide a redundant '-D' in your "

include/swift/AST/DiagnosticsParse.def

@@ -1568,9 +1568,6 @@ ERROR(attr_specialize_unknown_parameter_name,none,
 ERROR(attr_specialize_expected_bool_value,none,
       "expected a boolean true or false value in '_specialize' attribute", ())
 
-WARNING(attr_specialize_export_true_no_op,none,
-        "'exported: true' has no effect in '_specialize' attribute", ())
-
 ERROR(attr_specialize_missing_parameter_label_or_where_clause,none,
       "expected a parameter label or a where clause in '_specialize' attribute", ())
 

include/swift/AST/DiagnosticsSema.def

@@ -766,7 +766,7 @@ ERROR(serialization_target_too_new_repl,none,
 
 ERROR(serialization_fatal,Fatal,
       "fatal error encountered while reading from module '%0'; "
-      "please file a bug report with your project and the crash log",
+      SWIFT_BUG_REPORT_MESSAGE,
       (StringRef))
 NOTE(serialization_misc_version,none,
      "module '%0' full misc version is '%1'",
@@ -2735,6 +2735,7 @@ NOTE(construct_raw_representable_from_unwrapped_value,none,
 
 ERROR(decl_from_hidden_module,none,
       "cannot use %0 %1 %select{here|as property wrapper here|"
+      "as result builder here|"
       "in an extension with public or '@usableFromInline' members|"
       "in an extension with conditional conformances}2; "
       "%select{%3 has been imported as implementation-only|"
@@ -2743,12 +2744,14 @@ ERROR(decl_from_hidden_module,none,
       (DescriptiveDeclKind, DeclName, unsigned, Identifier, unsigned))
 WARNING(decl_from_hidden_module_warn,none,
       "cannot use %0 %1 %select{in SPI|as property wrapper in SPI|"
+      "as result builder in SPI|"
       "in an extension with public or '@usableFromInline' members|"
       "in an extension with conditional conformances}2; "
       "%select{%3 has been imported as implementation-only}4",
       (DescriptiveDeclKind, DeclName, unsigned, Identifier, unsigned))
 ERROR(conformance_from_implementation_only_module,none,
       "cannot use conformance of %0 to %1 %select{here|as property wrapper here|"
+      "as result builder here|"
       "in an extension with public or '@usableFromInline' members|"
       "in an extension with conditional conformances}2; "
       "%select{%3 has been imported as implementation-only|"
@@ -3499,7 +3502,7 @@ ERROR(type_of_expression_is_ambiguous,none,
 
 ERROR(failed_to_produce_diagnostic,Fatal,
       "failed to produce diagnostic for expression; "
-      "please file a bug report", ())
+      SWIFT_BUG_REPORT_MESSAGE, ())
 
 
 ERROR(missing_protocol,none,

include/swift/AST/ForeignAsyncConvention.h

@@ -26,42 +26,51 @@ namespace swift {
 class ForeignAsyncConvention {
 public:
   struct Info {
+  private:
     /// The index of the completion handler parameters.
     unsigned CompletionHandlerParamIndex;
 
     /// When non-zero, indicates which parameter to the completion handler is
     /// the Error? parameter (minus one) that makes this async function also
     /// throwing.
-    unsigned CompletionHandlerErrorParamIndex;
-
+    unsigned CompletionHandlerErrorParamIndexPlusOneOrZero;
+    
+  public:
     Info()
-      : CompletionHandlerParamIndex(0), CompletionHandlerErrorParamIndex(0) { }
+      : CompletionHandlerParamIndex(0),
+        CompletionHandlerErrorParamIndexPlusOneOrZero(0) { }
 
     Info(
         unsigned completionHandlerParamIndex,
         Optional<unsigned> completionHandlerErrorParamIndex)
       : CompletionHandlerParamIndex(completionHandlerParamIndex),
-        CompletionHandlerErrorParamIndex(
+        CompletionHandlerErrorParamIndexPlusOneOrZero(
             completionHandlerErrorParamIndex
               ? *completionHandlerErrorParamIndex + 1
               : 0) {}
 
+    /// Retrieve the index of the completion handler argument in the method's
+    /// parameter list.
+    unsigned completionHandlerParamIndex() const {
+      return CompletionHandlerParamIndex;
+    }
+    
     /// Retrieve the index of the \c Error? parameter in the completion handler's
     /// parameter list. When argument passed to this parameter is non-null, the
     /// provided error will be thrown by the async function.
     Optional<unsigned> completionHandlerErrorParamIndex() const {
-      if (CompletionHandlerErrorParamIndex == 0)
+      if (CompletionHandlerErrorParamIndexPlusOneOrZero == 0)
         return None;
 
-      return CompletionHandlerErrorParamIndex - 1;
+      return CompletionHandlerErrorParamIndexPlusOneOrZero - 1;
     }
 
     /// Whether the async function is throwing due to the completion handler
     /// having an \c Error? parameter.
     ///
     /// Equivalent to \c static_cast<bool>(completionHandlerErrorParamIndex()).
     bool isThrowing() const {
-      return CompletionHandlerErrorParamIndex != 0;
+      return CompletionHandlerErrorParamIndexPlusOneOrZero != 0;
     }
   };
 
@@ -88,7 +97,7 @@ class ForeignAsyncConvention {
   /// Retrieve the index of the completion handler parameter, which will be
   /// erased from the Swift signature of the imported async function.
   unsigned completionHandlerParamIndex() const {
-    return TheInfo.CompletionHandlerParamIndex;
+    return TheInfo.completionHandlerParamIndex();
   }
 
   /// Retrieve the index of the \c Error? parameter in the completion handler's
@@ -108,10 +117,10 @@ class ForeignAsyncConvention {
 
   bool operator==(ForeignAsyncConvention other) const {
     return CompletionHandlerType == other.CompletionHandlerType
-        && TheInfo.CompletionHandlerParamIndex ==
-          other.TheInfo.CompletionHandlerParamIndex
-        && TheInfo.CompletionHandlerErrorParamIndex ==
-          other.TheInfo.CompletionHandlerErrorParamIndex;
+        && TheInfo.completionHandlerParamIndex()
+             == other.TheInfo.completionHandlerParamIndex()
+        && TheInfo.completionHandlerErrorParamIndex()
+             == other.TheInfo.completionHandlerErrorParamIndex();
   }
 
   bool operator!=(ForeignAsyncConvention other) const {

include/swift/AST/ForeignInfo.h

@@ -19,6 +19,7 @@
 #ifndef SWIFT_FOREIGN_INFO_H
 #define SWIFT_FOREIGN_INFO_H
 
+#include "swift/AST/ForeignAsyncConvention.h"
 #include "swift/AST/ForeignErrorConvention.h"
 #include "swift/AST/Decl.h"
 
@@ -27,6 +28,7 @@ namespace swift {
 struct ForeignInfo {
   ImportAsMemberStatus Self;
   Optional<ForeignErrorConvention> Error;
+  Optional<ForeignAsyncConvention> Async;
 };
 
 } // end namespace swift

include/swift/AST/ModuleLoader.h

@@ -28,7 +28,7 @@
 #include <system_error>
 
 namespace llvm {
-class FileCollector;
+class FileCollectorBase;
 }
 
 namespace clang {
@@ -84,7 +84,7 @@ class DependencyTracker {
 public:
   explicit DependencyTracker(
       IntermoduleDepTrackingMode Mode,
-      std::shared_ptr<llvm::FileCollector> FileCollector = {});
+      std::shared_ptr<llvm::FileCollectorBase> FileCollector = {});
 
   /// Adds a file as a dependency.
   ///

include/swift/Basic/Compiler.h

@@ -89,4 +89,18 @@
 #define SWIFT_ATTRIBUTE_NORETURN
 #endif
 
+#ifndef SWIFT_BUG_REPORT_URL
+#define SWIFT_BUG_REPORT_URL "https://swift.org/contributing/#reporting-bugs"
+#endif
+
+#define SWIFT_BUG_REPORT_MESSAGE_BASE \
+  "submit a bug report (" SWIFT_BUG_REPORT_URL \
+  ") and include the project"
+
+#define SWIFT_BUG_REPORT_MESSAGE \
+  "please " SWIFT_BUG_REPORT_MESSAGE_BASE
+
+#define SWIFT_CRASH_BUG_REPORT_MESSAGE \
+  "Please " SWIFT_BUG_REPORT_MESSAGE_BASE " and the crash backtrace."
+
 #endif // SWIFT_BASIC_COMPILER_H

include/swift/ClangImporter/ClangImporter.h

@@ -23,7 +23,7 @@
 
 namespace llvm {
   class Triple;
-  class FileCollector;
+  class FileCollectorBase;
   template<typename Fn> class function_ref;
 }
 
@@ -172,9 +172,9 @@ class ClangImporter final : public ClangModuleLoader {
 
   /// Create a new clang::DependencyCollector customized to
   /// ClangImporter's specific uses.
-  static std::shared_ptr<clang::DependencyCollector>
-  createDependencyCollector(IntermoduleDepTrackingMode Mode,
-                            std::shared_ptr<llvm::FileCollector> FileCollector);
+  static std::shared_ptr<clang::DependencyCollector> createDependencyCollector(
+      IntermoduleDepTrackingMode Mode,
+      std::shared_ptr<llvm::FileCollectorBase> FileCollector);
 
   /// Append visible module names to \p names. Note that names are possibly
   /// duplicated, and not guaranteed to be ordered in any way.

include/swift/Demangling/DemangleNodes.def

@@ -159,6 +159,7 @@ CONTEXT_NODE(NativePinningMutableAddressor)
 NODE(NominalTypeDescriptor)
 NODE(NonObjCAttribute)
 NODE(Number)
+NODE(ObjCAsyncCompletionHandlerImpl)
 NODE(ObjCAttribute)
 NODE(ObjCBlock)
 NODE(EscapingObjCBlock)