Merge pull request #3936 from swiftwasm/main

Author: MaxDesiatov

CMakeLists.txt

@@ -93,6 +93,10 @@ option(SWIFT_BUILD_DYNAMIC_STDLIB
 option(SWIFT_BUILD_STATIC_STDLIB
     "Build static variants of the Swift standard library"
     FALSE)
+    
+option(SWIFT_STDLIB_STATIC_PRINT
+    "Build compile-time evaluated vprintf()"
+    FALSE)
 
 option(SWIFT_BUILD_DYNAMIC_SDK_OVERLAY
     "Build dynamic variants of the Swift SDK overlay"

include/swift/AST/ActorIsolation.h

@@ -132,6 +132,9 @@ class ActorIsolation {
 
   friend bool operator==(const ActorIsolation &lhs,
                          const ActorIsolation &rhs) {
+    if (lhs.isGlobalActor() && rhs.isGlobalActor())
+      return areTypesEqual(lhs.globalActor, rhs.globalActor);
+
     if (lhs.kind != rhs.kind)
       return false;
 
@@ -146,7 +149,7 @@ class ActorIsolation {
 
     case GlobalActor:
     case GlobalActorUnsafe:
-      return areTypesEqual(lhs.globalActor, rhs.globalActor);
+      llvm_unreachable("Global actors handled above");
     }
   }
 

include/swift/AST/DiagnosticsSIL.def

@@ -741,8 +741,8 @@ NOTE(sil_movekillscopyablevalue_use_here, none,
 NOTE(sil_movekillscopyablevalue_value_consumed_in_loop, none,
      "cyclic move here. move will occur multiple times in the loop", ())
 ERROR(sil_movekillscopyablevalue_move_applied_to_unsupported_move, none,
-      "_move applied to value that the compiler does not know how to check. "
-      "Please file a bug or an enhancement request!", ())
+      "_move applied to value that the compiler does not supporting checking.",
+      ())
 
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/DiagnosticsSema.def

@@ -4550,10 +4550,6 @@ ERROR(actor_isolated_witness,none,
 ERROR(distributed_actor_isolated_witness,none,
      "distributed actor-isolated %0 %1 cannot be used to satisfy a protocol requirement",
      (DescriptiveDeclKind, DeclName))
-ERROR(global_actor_isolated_requirement,none,
-      "%0 %1 must be isolated to the global actor %2 to satisfy corresponding "
-      "requirement from protocol %3",
-      (DescriptiveDeclKind, DeclName, Type, Identifier))
 ERROR(global_actor_isolated_witness,none,
       "%0 %1 isolated to global actor %2 can not satisfy corresponding "
       "requirement from protocol %3",

include/swift/Runtime/CMakeLists.txt

@@ -2,7 +2,7 @@
 set(SWIFT_BNI_OS_BUILD FALSE)
 set(SWIFT_BNI_XCODE_BUILD FALSE)
 if(DEFINED ENV{RC_XBS})
-  if(NOT DEFINED ENV{RC_XCODE} OR NOT "$ENV{RC_XCODE}")
+  if((NOT DEFINED ENV{RC_XCODE} OR NOT "$ENV{RC_XCODE}") AND (NOT DEFINED ENV{RC_PLAYGROUNDS} OR NOT "$ENV{RC_PLAYGROUNDS}"))
     set(SWIFT_BNI_OS_BUILD TRUE)
   else()
     set(SWIFT_BNI_XCODE_BUILD TRUE)

include/swift/SIL/SILInstruction.h

@@ -1976,10 +1976,14 @@ class AllocStackInst final
   /// Whether the alloc_stack instruction corresponds to a source-level VarDecl.
   bool isLexical() const { return lexical; }
 
-  /// If this is a lexical borrow, eliminate the lexical bit. If this borrow
-  /// doesn't have a lexical bit, do not do anything.
+  /// If this is a lexical alloc_stack, eliminate the lexical bit. If this
+  /// alloc_stack doesn't have a lexical bit, do not do anything.
   void removeIsLexical() { lexical = false; }
 
+  /// If this is not a lexical alloc_stack, set the lexical bit. If this
+  /// alloc_stack is already lexical, this does nothing.
+  void setIsLexical() { lexical = true; }
+
   /// Return the debug variable information attached to this instruction.
   Optional<SILDebugVariable> getVarInfo() const {
     Optional<SILType> AuxVarType;

lib/ClangImporter/ClangImporter.cpp

@@ -899,10 +899,12 @@ bool ClangImporter::canReadPCH(StringRef PCHFilename) {
       std::make_shared<clang::CompilerInvocation>(*Impl.Invocation);
   invocation->getPreprocessorOpts().DisablePCHOrModuleValidation =
       clang::DisableValidationForModuleKind::None;
-  invocation->getPreprocessorOpts().AllowPCHWithCompilerErrors = false;
   invocation->getHeaderSearchOpts().ModulesValidateSystemHeaders = true;
   invocation->getLangOpts()->NeededByPCHOrCompilationUsesPCH = true;
   invocation->getLangOpts()->CacheGeneratedPCH = true;
+  // If the underlying invocation is allowing PCH errors, then it "can be read",
+  // even if it has its error bit set. Thus, don't override
+  // `AllowPCHWithCompilerErrors`.
 
   // ClangImporter::create adds a remapped MemoryBuffer that we don't need
   // here.  Moreover, it's a raw pointer owned by the preprocessor options; if
@@ -1408,7 +1410,8 @@ bool ClangImporter::Implementation::importHeader(
   // Don't even try to load the bridging header if the Clang AST is in a bad
   // state. It could cause a crash.
   auto &clangDiags = getClangASTContext().getDiagnostics();
-  if (clangDiags.hasUnrecoverableErrorOccurred())
+  if (clangDiags.hasUnrecoverableErrorOccurred() &&
+      !getClangInstance()->getPreprocessorOpts().AllowPCHWithCompilerErrors)
     return true;
 
   assert(adapter);
@@ -1508,7 +1511,8 @@ bool ClangImporter::Implementation::importHeader(
                       getBufferImporterForDiagnostics());
 
   // FIXME: What do we do if there was already an error?
-  if (!hadError && clangDiags.hasErrorOccurred()) {
+  if (!hadError && clangDiags.hasErrorOccurred() &&
+      !getClangInstance()->getPreprocessorOpts().AllowPCHWithCompilerErrors) {
     diagnose(diagLoc, diag::bridging_header_error, headerName);
     return true;
   }
@@ -1711,7 +1715,8 @@ ClangImporter::emitBridgingPCH(StringRef headerPath,
       FrontendOpts, std::make_unique<clang::GeneratePCHAction>());
   emitInstance->ExecuteAction(*action);
 
-  if (emitInstance->getDiagnostics().hasErrorOccurred()) {
+  if (emitInstance->getDiagnostics().hasErrorOccurred() &&
+      !emitInstance->getPreprocessorOpts().AllowPCHWithCompilerErrors) {
     Impl.diagnose({}, diag::bridging_header_pch_error,
                   outputPCHPath, headerPath);
     return true;
@@ -1771,7 +1776,8 @@ bool ClangImporter::emitPrecompiledModule(StringRef moduleMapPath,
       std::make_unique<clang::GenerateModuleFromModuleMapAction>());
   emitInstance->ExecuteAction(*action);
 
-  if (emitInstance->getDiagnostics().hasErrorOccurred()) {
+  if (emitInstance->getDiagnostics().hasErrorOccurred() &&
+      !FrontendOpts.AllowPCMWithCompilerErrors) {
     Impl.diagnose({}, diag::emit_pcm_error, outputPath, moduleMapPath);
     return true;
   }

lib/FrontendTool/FrontendTool.cpp

@@ -1813,19 +1813,22 @@ createJSONFixItDiagnosticConsumerIfNeeded(
 
 /// A PrettyStackTraceEntry to print frontend information useful for debugging.
 class PrettyStackTraceFrontend : public llvm::PrettyStackTraceEntry {
-  const LangOptions &LangOpts;
+  const CompilerInvocation &Invocation;
 
 public:
-  PrettyStackTraceFrontend(const LangOptions &langOpts)
-      : LangOpts(langOpts) {}
+  PrettyStackTraceFrontend(const CompilerInvocation &invocation)
+      : Invocation(invocation) {}
 
   void print(llvm::raw_ostream &os) const override {
-    auto effective = LangOpts.EffectiveLanguageVersion;
+    auto effective = Invocation.getLangOptions().EffectiveLanguageVersion;
     if (effective != version::Version::getCurrentLanguageVersion()) {
       os << "Compiling with effective version " << effective;
     } else {
       os << "Compiling with the current language version";
     }
+    if (Invocation.getFrontendOptions().AllowModuleWithCompilerErrors) {
+      os << " while allowing modules with compiler errors";
+    }
     os << "\n";
   };
 };
@@ -1936,7 +1939,7 @@ int swift::performFrontend(ArrayRef<const char *> Args,
   /// (leaks checking is not thread safe).
   Invocation.getSILOptions().checkSILModuleLeaks = true;
 
-  PrettyStackTraceFrontend frontendTrace(Invocation.getLangOptions());
+  PrettyStackTraceFrontend frontendTrace(Invocation);
 
   // Make an array of PrettyStackTrace objects to dump the configuration files
   // we used to parse the arguments. These are RAII objects, so they and the

lib/IRGen/ClassTypeInfo.h

@@ -19,6 +19,7 @@
 
 #include "ClassLayout.h"
 #include "HeapTypeInfo.h"
+#include "TypeLayout.h"
 
 namespace swift {
 namespace irgen {
@@ -46,7 +47,7 @@ class ClassTypeInfo : public HeapTypeInfo<ClassTypeInfo> {
   ClassTypeInfo(llvm::PointerType *irType, Size size, SpareBitVector spareBits,
                 Alignment align, ClassDecl *theClass,
                 ReferenceCounting refcount)
-      : HeapTypeInfo(irType, size, std::move(spareBits), align),
+      : HeapTypeInfo(refcount, irType, size, std::move(spareBits), align),
         TheClass(theClass), Refcount(refcount) {}
 
   ReferenceCounting getReferenceCounting() const { return Refcount; }

lib/IRGen/GenArchetype.cpp

@@ -16,6 +16,7 @@
 
 #include "GenArchetype.h"
 
+#include "TypeLayout.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericEnvironment.h"
@@ -126,13 +127,11 @@ class ClassArchetypeTypeInfo
 {
   ReferenceCounting RefCount;
 
-  ClassArchetypeTypeInfo(llvm::PointerType *storageType,
-                         Size size, const SpareBitVector &spareBits,
-                         Alignment align,
+  ClassArchetypeTypeInfo(llvm::PointerType *storageType, Size size,
+                         const SpareBitVector &spareBits, Alignment align,
                          ReferenceCounting refCount)
-    : HeapTypeInfo(storageType, size, spareBits, align),
-      RefCount(refCount)
-  {}
+      : HeapTypeInfo(refCount, storageType, size, spareBits, align),
+        RefCount(refCount) {}
 
 public:
   static const ClassArchetypeTypeInfo *create(llvm::PointerType *storageType,