Merge remote-tracking branch 'origin/main' into rebranch

Conflicts:
	test/IRGen/opaque-pointer-llvm.swift

Author: shahmishal

docs/HowToGuides/FirstPullRequest.md

@@ -98,16 +98,26 @@ make changes, run tests and debug issues.
 
 ## Submitting a pull request
 
-### Tidying up
-
 Alright! You've implemented a change and would like to submit it.
-Double-check that you've tidied your Git history, such as squashing
-work-in-progress commits, and that your commit messages provide context.
-For example, if a commit fixes a bug, then include a "Fixes SR-NNNNN" with the
-bug number in the commit message.
 
-Next, [format your changes](/docs/HowToGuides/FAQ.md#how-do-i-format-my-changes)
-using `clang-format`.
+### Tidying up
+
+> **Note**  
+> If you intend to create a [draft pull request][draft-pr], you can tidy up
+> later *before* marking it as ready for review.
+
+1. [Tidy up your commit history](FAQ.md#how-do-i-clean-up-my-git-history):
+   * Squash work-in-progress commits.
+   * Break up your changes into as many self-sufficient, meaningful commits as
+     you can, rather than cramming everything into a single commit.
+     For example, a patch that renames a function (1) and modifies an algorithm
+     (2) can be split into two commits.
+     A self-sufficient commit must compile, pass all tests, and contain
+     any associated test changes.
+     This practice is key to efficient and rigorous code review processes,
+     as well as a neat, transparent, and actionable commit history.
+   * [Top off your commit messages](https://swift.org/contributing/#commit-messages).
+1. Tidy up and [format your code changes](FAQ.md#how-do-i-format-my-changes).
 
 ### Pushing and creating a pull request
 
@@ -120,21 +130,29 @@ show a helpful "Compare & Pull Request" button.
 
 ![Compare & Pull Request button in GitHub UI](/docs/GitHubCreatePRScreenshot.png)
 
+[draft-pr]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests
 [create a pull request]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request#creating-the-pull-request
 
 ## Asking for code review
 
-If you had an active discussion with someone on how to implement your change,
-you can `@` mention them in the PR description and ask for code review.
-If you directly implemented the change without any guidance from anyone else,
-`@` mention someone from GitHub's suggested reviewers. If GitHub doesn't
-make any suggestions, ask the [Code Owner](https://github.com/apple/swift/blob/main/CODE_OWNERS.TXT) based on the
-component for your change. Please ask someone though! We don't want you to get
-stuck because you were not sure who to ask for code review.
-
-At the beginning, contributors are not able to run the continuous integration
-(CI) bot, which builds the project and runs tests. Please ask your code
-reviewer(s) to invoke the bot for you.
+Collaborators and code owners are automatically requested for review per the
+[CODEOWNERS](/.github/CODEOWNERS) file. If no one is automatically requested for
+review, @mention and ask a suggested person under **Reviewers** to review your
+changes. If no reviewer suggestions are shown either, please
+[message][contributor-experience] the Contributor Experience Workgroup on the
+Swift forums to sort out review requests for you.
+
+You are welcome to invite other people for review as well — say, someone you
+had an active discussion with on how to implement your change.
+Anyone with a GitHub account can review or comment on changes proposed to
+this repository!
+
+Contributors without
+[write access](https://swift.org/contributing/#commit-access) are not able to
+run the continuous integration (CI) bot, which builds the project and runs
+tests. Please ask a code reviewer with write access to invoke the bot for you.
+
+[contributor-experience]: https://forums.swift.org/g/contributor-experience-workgroup
 
 ## Responding to code review comments
 

include/swift/AST/Attr.def

@@ -67,6 +67,8 @@ TYPE_ATTR(dynamic_self)
 #define REF_STORAGE(Name, name, ...) TYPE_ATTR(sil_##name)
 #include "swift/AST/ReferenceStorage.def"
 TYPE_ATTR(error)
+TYPE_ATTR(error_indirect)
+TYPE_ATTR(error_unowned)
 TYPE_ATTR(out)
 TYPE_ATTR(direct)
 TYPE_ATTR(in)

include/swift/AST/CASTBridging.h

@@ -165,6 +165,8 @@ typedef enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedTypeAttrKind : size_t {
   BridgedTypeAttrKind_sil_unowned,
   BridgedTypeAttrKind_sil_unmanaged,
   BridgedTypeAttrKind_error,
+  BridgedTypeAttrKind_error_indirect,
+  BridgedTypeAttrKind_error_unowned,
   BridgedTypeAttrKind_out,
   BridgedTypeAttrKind_direct,
   BridgedTypeAttrKind_in,

include/swift/AST/DiagnosticsSIL.def

@@ -352,6 +352,10 @@ ERROR(global_must_be_compile_time_const,none,
       "global variable must be a compile-time constant", ())
 ERROR(non_final_generic_class_function,none,
       "classes cannot have non-final generic fuctions in embedded Swift", ())
+ERROR(embedded_swift_existential_type,none,
+      "cannot use a value of protocol type %0 in embedded Swift", (Type))
+ERROR(embedded_swift_existential,none,
+      "cannot use a value of protocol type in embedded Swift", ())
 NOTE(performance_called_from,none,
       "called from here", ())
 

include/swift/Basic/LangOptions.h

@@ -177,7 +177,7 @@ namespace swift {
     llvm::VersionTuple MinimumInliningTargetVersion;
 
     /// The alternate name to use for the entry point instead of main.
-    std::string entryPointFunctionName = "main";
+    std::optional<std::string> entryPointFunctionName;
 
     ///
     /// Language features

include/swift/SIL/ApplySite.h

@@ -679,12 +679,17 @@ class FullApplySite : public ApplySite {
     return getSubstCalleeConv().getNumIndirectSILResults();
   }
 
+  unsigned getNumIndirectSILErrorResults() const {
+    return getSubstCalleeConv().getNumIndirectSILErrorResults();
+  }
+
   OperandValueArrayRef getIndirectSILResults() const {
     return getArguments().slice(0, getNumIndirectSILResults());
   }
 
   OperandValueArrayRef getArgumentsWithoutIndirectResults() const {
-    return getArguments().slice(getNumIndirectSILResults());
+    return getArguments().slice(getNumIndirectSILResults() +
+                                getNumIndirectSILErrorResults());
   }
 
   InoutArgumentRange getInoutArguments() const {

include/swift/SIL/SILFunctionConventions.h

@@ -232,8 +232,20 @@ class SILFunctionConventions {
                                     : funcTy->getNumPackResults();
   }
 
+  /// Get the number of SIL error results passed as address-typed arguments.
+  unsigned getNumIndirectSILErrorResults() const {
+    if (!silConv.loweredAddresses)
+      return 0;
+    if (auto errorResultInfo = funcTy->getOptionalErrorResult()) {
+      return errorResultInfo->getConvention() == ResultConvention::Indirect ? 1 : 0;
+    }
+
+    return 0;
+  }
+
   /// Are any SIL results passed as address-typed arguments?
   bool hasIndirectSILResults() const { return getNumIndirectSILResults() != 0; }
+  bool hasIndirectSILErrorResults() const { return getNumIndirectSILErrorResults() != 0; }
 
   struct IndirectSILResultFilter {
     bool loweredAddresses;
@@ -381,7 +393,7 @@ class SILFunctionConventions {
   unsigned getSILArgIndexOfFirstIndirectResult() const { return 0; }
 
   unsigned getSILArgIndexOfFirstParam() const {
-    return getNumIndirectSILResults();
+    return getNumIndirectSILResults() + getNumIndirectSILErrorResults();
   }
 
   /// Returns the index of self.
@@ -410,13 +422,15 @@ class SILFunctionConventions {
   /// this function type. This is also the total number of SILArguments
   /// in the entry block.
   unsigned getNumSILArguments() const {
-    return getNumIndirectSILResults() + funcTy->getNumParameters();
+    return getNumIndirectSILResults() + getNumIndirectSILErrorResults() +
+      funcTy->getNumParameters();
   }
 
   SILParameterInfo getParamInfoForSILArg(unsigned index) const {
-    assert(index >= getNumIndirectSILResults()
+    assert(index >= (getNumIndirectSILResults() + getNumIndirectSILErrorResults())
            && index <= getNumSILArguments());
-    return funcTy->getParameters()[index - getNumIndirectSILResults()];
+    return funcTy->getParameters()[index - getNumIndirectSILResults()
+                                         - getNumIndirectSILErrorResults()];
   }
 
   /// Return the SIL argument convention of apply/entry argument at
@@ -518,11 +532,20 @@ inline SILType
 SILFunctionConventions::getSILArgumentType(unsigned index,
                                            TypeExpansionContext context) const {
   assert(index <= getNumSILArguments());
-  if (index < getNumIndirectSILResults()) {
+  auto numIndirectSILResults = getNumIndirectSILResults();
+  if (index < numIndirectSILResults) {
     return *std::next(getIndirectSILResultTypes(context).begin(), index);
   }
+
+  auto numIndirectSILErrorResults = getNumIndirectSILErrorResults();
+  if (numIndirectSILErrorResults &&
+      (index < (numIndirectSILResults + numIndirectSILErrorResults))) {
+    return getSILType(funcTy->getErrorResult(), context);
+  }
+
   return getSILType(
-      funcTy->getParameters()[index - getNumIndirectSILResults()], context);
+      funcTy->getParameters()[index - numIndirectSILResults -
+                              numIndirectSILErrorResults], context);
 }
 
 inline bool

include/swift/Serialization/SerializationOptions.h

@@ -158,6 +158,7 @@ namespace swift {
     bool EmbeddedSwiftModule = false;
     bool IsOSSA = false;
     bool SkipNonExportableDecls = false;
+    bool ExplicitModuleBuild = false;
   };
 
 } // end namespace swift

lib/AST/ASTContext.cpp

@@ -5906,7 +5906,14 @@ ASTContext::SILTransformCtors ASTContext::getIRGenSILTransforms() const {
 }
 
 std::string ASTContext::getEntryPointFunctionName() const {
-  return LangOpts.entryPointFunctionName;
+  // Set default entry point name
+  //
+  // Usually the main entrypoint is "main" but WebAssembly's C ABI uses
+  // "__main_argc_argv" for `int (int, char **)` signature and Swift's
+  // main entrypoint always takes argc/argv.
+  // See https://github.com/WebAssembly/tool-conventions/blob/main/BasicCABI.md
+  std::string defaultName = LangOpts.Target.isWasm() ? "__main_argc_argv" :  "main";
+  return LangOpts.entryPointFunctionName.value_or(defaultName);
 }
 
 SILLayout *SILLayout::get(ASTContext &C,

lib/AST/ASTPrinter.cpp

@@ -6952,10 +6952,18 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       }
 
       if (T->hasErrorResult()) {
-        // The error result is implicitly @owned; don't print that.
-        assert(T->getErrorResult().getConvention() == ResultConvention::Owned);
         sub->Printer.printSeparator(first, ", ");
-        sub->Printer << "@error ";
+        if (T->getErrorResult().getConvention() == ResultConvention::Owned)
+          sub->Printer << "@error ";
+        else if (T->getErrorResult().getConvention() == ResultConvention::Indirect)
+          sub->Printer << "@error_indirect ";
+        else if (T->getErrorResult().getConvention() == ResultConvention::Unowned)
+          sub->Printer << "@error_unowned ";
+        else {
+          assert(false && "Should have error, error_indirect, or error_unowned");
+        }
+
+
         T->getErrorResult().getInterfaceType().print(sub->Printer, subOptions);
       }