Merge pull request #2225 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

docs/SIL.rst

@@ -5894,6 +5894,25 @@ This instruction is assumed to forward a fixed ownership (set upon its
 construction) and lowers to 'unchecked_bitwise_cast' in non-ossa code. This
 causes the cast to lose its guarantee of layout-compatibility.
 
+unchecked_ownership_conversion
+``````````````````````````````
+::
+
+   sil-instruction ::= 'unchecked_ownership_conversion' sil-operand ',' sil-value-ownership-kind 'to' sil-value-ownership-kind
+
+   %1 = unchecked_ownership_conversion %0 : $A, @guaranteed to @owned
+
+Converts its operand to an identical value of the same type but with
+different ownership without performing any semantic operations
+normally required by for ownership conversion.
+
+This is used in Objective-C compatible destructors to convert a
+guaranteed parameter to an owned parameter without performing a
+semantic copy.
+
+The resulting value must meet the usual ownership requirements; for
+example, a trivial type must have '.none' ownership.
+
 ref_to_raw_pointer
 ``````````````````
 ::

include/swift/AST/Builtins.def

@@ -736,6 +736,15 @@ BUILTIN_MISC_OPERATION_WITH_SILGEN(CancelAsyncTask, "cancelAsyncTask", "", Speci
 /// a function to execute.
 BUILTIN_MISC_OPERATION_WITH_SILGEN(CreateAsyncTask, "createAsyncTask", "", Special)
 
+/// createAsyncTaskFuture(): (
+///     Int, Builtin.NativeObject?, @escaping () async throws -> T
+/// ) -> Builtin.NativeObject
+///
+/// Create a new asynchronous task future, given flags, an (optional) parent
+/// task and a function to execute.
+BUILTIN_MISC_OPERATION_WITH_SILGEN(CreateAsyncTaskFuture,
+    "createAsyncTaskFuture", "", Special)
+
 /// globalStringTablePointer has type String -> Builtin.RawPointer.
 /// It returns an immortal, global string table pointer for strings constructed
 /// from string literals. We consider it effects as readnone meaning that it

include/swift/AST/DiagnosticsFrontend.def

@@ -128,7 +128,8 @@ ERROR(error_mode_cannot_emit_interface,none,
 ERROR(error_mode_cannot_emit_module_summary,none,
       "this mode does not support emitting module summary files", ())
 ERROR(cannot_emit_ir_skipping_function_bodies,none,
-      "-experimental-skip-*-function-bodies do not support emitting IR", ())
+      "the -experimental-skip-*-function-bodies* flags do not support "
+      "emitting IR", ())
 
 WARNING(emit_reference_dependencies_without_primary_file,none,
   "ignoring -emit-reference-dependencies (requires -primary-file)", ())
@@ -415,9 +416,9 @@ ERROR(expectation_missing_opening_braces,none,
 ERROR(expectation_missing_closing_braces,none,
       "didn't find '}}' to match '{{' in expectation", ())
 
-WARNING(module_incompatible_with_skip_non_inlinable_function_bodies,none,
-        "module '%0' cannot be built with "
-        "-experimental-skip-non-inlinable-function-bodies; this option has "
+WARNING(module_incompatible_with_skip_function_bodies,none,
+        "module '%0' cannot be built with any of the "
+        "-experimental-skip-*-function-bodies* flags; they have "
         "been automatically disabled", (StringRef))
 
 #define UNDEFINE_DIAGNOSTIC_MACROS

include/swift/AST/GenericParamList.h

@@ -324,6 +324,9 @@ class GenericParamList final :
     if (WhereLoc.isInvalid())
       return SourceRange();
 
+    if (Requirements.empty())
+      return WhereLoc;
+
     auto endLoc = Requirements.back().getSourceRange().End;
     return SourceRange(WhereLoc, endLoc);
   }
@@ -352,16 +355,18 @@ class alignas(RequirementRepr) TrailingWhereClause final :
   friend TrailingObjects;
 
   SourceLoc WhereLoc;
+  SourceLoc EndLoc;
 
   /// The number of requirements. The actual requirements are tail-allocated.
   unsigned NumRequirements;
 
-  TrailingWhereClause(SourceLoc whereLoc,
+  TrailingWhereClause(SourceLoc whereLoc, SourceLoc endLoc,
                       ArrayRef<RequirementRepr> requirements);
 
 public:
   /// Create a new trailing where clause with the given set of requirements.
-  static TrailingWhereClause *create(ASTContext &ctx, SourceLoc whereLoc,
+  static TrailingWhereClause *create(ASTContext &ctx,
+                                     SourceLoc whereLoc, SourceLoc endLoc,
                                      ArrayRef<RequirementRepr> requirements);
 
   /// Retrieve the location of the 'where' keyword.
@@ -379,8 +384,7 @@ class alignas(RequirementRepr) TrailingWhereClause final :
 
   /// Compute the source range containing this trailing where clause.
   SourceRange getSourceRange() const {
-    return SourceRange(WhereLoc,
-                       getRequirements().back().getSourceRange().End);
+    return SourceRange(WhereLoc, EndLoc);
   }
 
   void print(llvm::raw_ostream &OS, bool printWhereKeyword) const;

include/swift/Basic/LangOptions.h

@@ -258,9 +258,6 @@ namespace swift {
     /// This is a staging flag; eventually it will be removed.
     bool EnableDeserializationRecovery = true;
 
-    /// Someday, ASTScopeLookup will supplant lookup in the parser
-    bool DisableParserLookup = false;
-
     /// Whether to enable the new operator decl and precedencegroup lookup
     /// behavior. This is a staging flag, and will be removed in the future.
     bool EnableNewOperatorLookup = false;