Merge pull request #3747 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

CMakeLists.txt

@@ -610,6 +610,13 @@ elseif(LIBSWIFT_BUILD_MODE STREQUAL "BOOTSTRAPPING" OR LIBSWIFT_BUILD_MODE STREQ
   set(SWIFT_EXEC_FOR_LIBSWIFT "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc")
 endif()
 
+if(LIBSWIFT_BUILD_MODE STREQUAL "HOSTTOOLS" OR LIBSWIFT_BUILD_MODE STREQUAL "BOOTSTRAPPING-WITH-HOSTLIBS")
+  if(SWIFT_ENABLE_ARRAY_COW_CHECKS)
+    message(STATUS "array COW checks disabled when building libswift with host libraries")
+    set(SWIFT_ENABLE_ARRAY_COW_CHECKS FALSE)
+  endif()
+endif()
+
 # This setting causes all CMakeLists.txt to automatically have
 # ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CURRENT_SOURCE_DIR} as an
 # include_directories path. This is done for developer

cmake/modules/AddSwift.cmake

@@ -912,7 +912,7 @@ function(add_swift_host_tool executable)
 
         # At build time link against the built swift libraries from the
         # previous bootstrapping stage.
-        get_bootstrapping_swift_lib_dir(bs_lib_dir "${bootstrapping}")
+        get_bootstrapping_swift_lib_dir(bs_lib_dir "${ASHT_BOOTSTRAPPING}")
         target_link_directories(${executable} PRIVATE ${bs_lib_dir})
 
         # At runtime link against the built swift libraries from the current
@@ -981,7 +981,7 @@ function(add_swift_host_tool executable)
     elseif(LIBSWIFT_BUILD_MODE STREQUAL "BOOTSTRAPPING")
       # At build time link against the built swift libraries from the
       # previous bootstrapping stage.
-      get_bootstrapping_swift_lib_dir(bs_lib_dir "${bootstrapping}")
+      get_bootstrapping_swift_lib_dir(bs_lib_dir "${ASHT_BOOTSTRAPPING}")
       target_link_directories(${executable} PRIVATE ${bs_lib_dir})
 
       # At runtime link against the built swift libraries from the current

include/swift/AST/DiagnosticsSema.def

@@ -1600,8 +1600,8 @@ ERROR(originally_definedin_topleve_decl,none,
 ERROR(originally_definedin_need_available,none,
       "need @available attribute for @%0", (StringRef))
 
-ERROR(originally_definedin_must_after_available_version,none,
-      "moved version from @%0 must after introduced OS version", (StringRef))
+ERROR(originally_definedin_must_not_before_available_version,none,
+      "symbols are moved to the current module before they were available in the OSs", (StringRef))
 
 // Alignment attribute
 ERROR(alignment_not_power_of_two,none,

lib/SILGen/SILGenDistributed.cpp

@@ -128,9 +128,6 @@ static void emitDistributedActorStore_transport(
     SILArgument *transportArg) {
   auto &B = SGF.B;
 
-  auto &SGM = SGF.SGM;
-  SILGenFunctionBuilder builder(SGM);
-
   auto *dc = func->getDeclContext();
   auto classDecl = dc->getSelfClassDecl();
 
@@ -148,42 +145,36 @@ static void emitDistributedActorStore_transport(
       loc, actorSelf, var,
       SGF.getLoweredType(var->getInterfaceType()));
 
-  // ==== Store the transport
-  B.createCopyAddr(loc,
-                   /*src*/transportArg,
-                   /*dest*/fieldAddr,
-                   IsNotTake, IsInitialization);
-}
-
-// TODO(distributed): remove this store impl and reuse Store_transport
-static void
-emitDistributedActor_init_transportStore(
-    SILGenFunction &SGF,
-    ManagedValue borrowedSelfArg, VarDecl *selfDecl,
-    ConstructorDecl *ctor,
-    Pattern *pattern, VarDecl *var) {
-  auto &C = selfDecl->getASTContext();
-  auto &B = SGF.B;
-  auto &F = SGF.F;
-  auto &SGM = SGF.SGM;
-  SILGenFunctionBuilder builder(SGM);
-
-  auto loc = SILLocation(ctor);
-  loc.markAutoGenerated();
-
-  // ==== Prepare assignment: get the self.transport address
-  SILValue transportArgValue = getActorTransportArgument(C, F, ctor);
-
-  // ----
-
-  auto transportFieldAddr = B.createRefElementAddr(
-      loc, borrowedSelfArg.getValue(), var,
-      SGF.getLoweredType(var->getInterfaceType()));
+  // If the argument is not existential, it will be a concrete type
+  // that can be erased to that existential.
+  SILValue transportValue = transportArg;
+  if (!transportArg->getType().isExistentialType()) {
+    auto &existentialTL = SGF.getTypeLowering(var->getInterfaceType());
+    auto concreteFormalType = transportArg->getType().getASTType();
+
+    auto archetype = OpenedArchetypeType::getAny(var->getInterfaceType());
+    AbstractionPattern abstractionPattern(archetype);
+    auto &concreteTL = SGF.getTypeLowering(abstractionPattern,
+                                           concreteFormalType);
+
+    auto module = dc->getParentModule();
+    auto actorTransportProto = C.getProtocol(KnownProtocolKind::ActorTransport);
+    ProtocolConformanceRef conformances[] = {
+        module->lookupConformance(concreteFormalType, actorTransportProto) };
+    ManagedValue mv = SGF.emitExistentialErasure(loc, concreteFormalType,
+                                                 concreteTL, existentialTL,
+                                                 C.AllocateCopy(conformances),
+                                                 SGFContext(),
+                                 [&](SGFContext C) -> ManagedValue {
+                                   return ManagedValue::forBorrowedRValue(transportArg);
+                                 });
+    transportValue = mv.getValue();
+  }
 
   // ==== Store the transport
   B.createCopyAddr(loc,
-                   /*src*/transportArgValue,
-                   /*dest*/transportFieldAddr,
+                   /*src*/transportValue,
+                   /*dest*/fieldAddr,
                    IsNotTake, IsInitialization);
 }
 
@@ -254,14 +245,17 @@ static void emitDistributedActorStore_init_assignIdentity(
   assert(distributedActorProto);
   assert(transportProto);
 
-  // --- Open the transport existential
-  OpenedArchetypeType *Opened;
+  // --- Open the transport existential, if needed.
+  SILValue transportValue = transportArgValue;
   auto transportASTType = transportArgValue->getType().getASTType();
-  auto openedTransportType =
-      transportASTType->openAnyExistentialType(Opened)->getCanonicalType();
-  auto openedTransportSILType = F.getLoweredType(openedTransportType);
-  auto transportArchetypeValue = B.createOpenExistentialAddr(
-      loc, transportArgValue, openedTransportSILType, OpenedExistentialAccess::Immutable);
+  if (transportASTType->isAnyExistentialType()) {
+    OpenedArchetypeType *Opened;
+    transportASTType =
+        transportASTType->openAnyExistentialType(Opened)->getCanonicalType();
+    transportValue = B.createOpenExistentialAddr(
+        loc, transportValue, F.getLoweredType(transportASTType),
+        OpenedExistentialAccess::Immutable);
+  }
 
   // --- prepare `Self.self` metatype
   auto *selfTyDecl = ctor->getParent()->getSelfNominalTypeDecl();
@@ -298,7 +292,7 @@ static void emitDistributedActorStore_init_assignIdentity(
 
   auto assignWitnessMethod = B.createWitnessMethod(
       loc,
-      /*lookupTy*/openedTransportType,
+      /*lookupTy*/transportASTType,
       /*Conformance*/transportConfRef,
       /*member*/assignIdentityRef,
       /*methodTy*/assignIdentitySILTy);
@@ -308,7 +302,7 @@ static void emitDistributedActorStore_init_assignIdentity(
 
   SubstitutionMap subs =
       SubstitutionMap::get(genericSig,
-                           {openedTransportType, selfTy},
+                           {transportASTType, selfTy},
                            {transportConfRef, distributedActorConfRef});
 
   // --- create a temporary storage for the result of the call
@@ -319,7 +313,7 @@ static void emitDistributedActorStore_init_assignIdentity(
   // ---- actually call transport.assignIdentity(Self.self)
   B.createApply(
       loc, assignWitnessMethod, subs,
-      { temp, selfMetatypeValue, transportArchetypeValue});
+      { temp, selfMetatypeValue, transportValue});
 
   // ==== Assign the identity to stored property
   // TODO(distributed): reuse emitDistributedActorStore_id here, pass the SILValue
@@ -374,9 +368,9 @@ void SILGenFunction::initializeDistributedActorImplicitStorageInit(
     if (var->getName() == C.Id_actorTransport &&
         var->getInterfaceType()->isEqual(transportTy)) {
       transportMember = var;
-      // TODO(distributed): reuse emitDistributedActorStore_transport
-      emitDistributedActor_init_transportStore(
-          *this, borrowedSelfArg, selfVarDecl, ctor, pattern, var);
+      emitDistributedActorStore_transport(
+          C, *this, borrowedSelfArg.getValue(), ctor,
+          getActorTransportArgument(C, F, ctor));
     } else if (var->getName() == C.Id_id &&
                (var->getInterfaceType()->isEqual(identityProtoTy) ||
                 var->getInterfaceType()->isEqual(anyIdentityTy))) { // TODO(distributed): stick one way to store, but today we can't yet store the existential
@@ -417,13 +411,16 @@ void SILGenFunction::emitDistributedActorReady(
   assert(transportProto);
 
   // --- Open the transport existential
-  OpenedArchetypeType *Opened;
-  auto transportASTType = transportArgValue->getType().getASTType();
-  auto openedTransportType =
-      transportASTType->openAnyExistentialType(Opened)->getCanonicalType();
-  auto openedTransportSILType = F.getLoweredType(openedTransportType);
-  auto transportArchetypeValue = B.createOpenExistentialAddr(
-      loc, transportArgValue, openedTransportSILType, OpenedExistentialAccess::Immutable);
+  SILValue transportValue = transportArgValue;
+  auto transportASTType = transportValue->getType().getASTType();
+  if (transportASTType->isAnyExistentialType()) {
+    OpenedArchetypeType *Opened;
+    transportASTType =
+        transportASTType->openAnyExistentialType(Opened)->getCanonicalType();
+    transportValue = B.createOpenExistentialAddr(
+        loc, transportValue, F.getLoweredType(transportASTType),
+        OpenedExistentialAccess::Immutable);
+  }
 
   // === Make the transport.actorReady call
   // --- prepare the witness_method
@@ -453,7 +450,7 @@ void SILGenFunction::emitDistributedActorReady(
 
   auto readyWitnessMethod = B.createWitnessMethod(
       loc,
-      /*lookupTy*/openedTransportType,
+      /*lookupTy*/transportASTType,
       /*Conformance*/transportConfRef,
       /*member*/actorReadyRef,
       /*methodTy*/actorReadySILTy);
@@ -463,13 +460,13 @@ void SILGenFunction::emitDistributedActorReady(
 
   SubstitutionMap subs =
       SubstitutionMap::get(genericSig,
-                           {openedTransportType, selfTy},
+                           {transportASTType, selfTy},
                            {transportConfRef, distributedActorConfRef});
 
   // ---- actually call transport.actorReady(self)
   B.createApply(
       loc, readyWitnessMethod, subs,
-      { selfArgValue, transportArchetypeValue});
+      { selfArgValue, transportValue});
 }
 
 /******************************************************************************/

lib/SILOptimizer/Transforms/DeadCodeElimination.cpp

@@ -601,13 +601,19 @@ bool DCE::removeDead() {
           // may also have been dead and a destroy_value of its baseValue may
           // have been inserted before the pred's terminator. Make sure to
           // adjust the insertPt before any destroy_value.
+          //
+          // FIXME: This code currently can reorder destroys, e.g., when the
+          //        block already contains a destroy_value just before the
+          //        terminator.  Fix this by making note of the added
+          //        destroy_value insts and only moving the insertion point
+          //        before those that are newly added.
           for (SILInstruction &predInst : llvm::reverse(*pred)) {
             if (&predInst == predTerm)
               continue;
             if (!isa<DestroyValueInst>(&predInst)) {
-              insertPt = &*std::next(predInst.getIterator());
               break;
             }
+            insertPt = &predInst;
           }
         }
 

lib/SILOptimizer/Utils/OwnershipOptUtils.cpp

@@ -350,6 +350,11 @@ static bool canFixUpOwnershipForRAUW(SILValue oldValue, SILValue newValue,
   if (oldValue.getOwnershipKind() != OwnershipKind::Guaranteed)
     return true;
 
+  SILValue newRoot = findOwnershipReferenceAggregate(newValue);
+  if (newRoot && isa<SILFunctionArgument>(newRoot)
+      && newRoot->getOwnershipKind() == OwnershipKind::Guaranteed) {
+    return true;
+  }
   // Check that the old lifetime can be extended and record the necessary
   // book-keeping in the OwnershipFixupContext.
   context.clear();
@@ -870,9 +875,10 @@ SILValue
 OwnershipLifetimeExtender::borrowOverValue(SILValue newValue,
                                            SILValue guaranteedValue) {
   // Avoid borrowing guaranteed function arguments.
-  if (isa<SILFunctionArgument>(newValue)
-      && newValue.getOwnershipKind() == OwnershipKind::Guaranteed) {
-    return newValue;
+  if (newValue.getOwnershipKind() == OwnershipKind::Guaranteed) {
+    SILValue newRoot = findOwnershipReferenceAggregate(newValue);
+    if (newRoot && isa<SILFunctionArgument>(newRoot))
+      return newValue;
   }
   auto borrowedValue = BorrowedValue(guaranteedValue);
   if (borrowedValue && borrowedValue.isLocalScope()) {

lib/Sema/CSRanking.cpp

@@ -1368,8 +1368,14 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
 
   // Find a potential best.
   SmallVector<bool, 16> losers(viable.size(), false);
+  Score bestScore = viable.front().getFixedScore();
   unsigned bestIdx = 0;
   for (unsigned i = 1, n = viable.size(); i != n; ++i) {
+    auto currScore = viable[i].getFixedScore();
+
+    if (currScore < bestScore)
+      bestScore = currScore;
+
     switch (compareSolutions(*this, viable, diff, i, bestIdx)) {
     case SolutionCompareResult::Identical:
       // FIXME: Might want to warn about this in debug builds, so we can
@@ -1424,52 +1430,14 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
     return bestIdx;
   }
 
-  // If there is not a single "better" than others
-  // solution, which probably means that solutions
-  // were incomparable, let's just keep the original
-  // list instead of removing everything, even if we
-  // are asked to "minimize" the result.
-  if (losers.size() == viable.size())
+  if (!minimize)
     return None;
 
-  // The comparison was ambiguous. Identify any solutions that are worse than
-  // any other solution.
-  for (unsigned i = 0, n = viable.size(); i != n; ++i) {
-    // If the first solution has already lost once, don't bother looking
-    // further.
-    if (losers[i])
-      continue;
-
-    for (unsigned j = i + 1; j != n; ++j) {
-      // If the second solution has already lost once, don't bother looking
-      // further.
-      if (losers[j])
-        continue;
-
-      switch (compareSolutions(*this, viable, diff, i, j)) {
-      case SolutionCompareResult::Identical:
-        // FIXME: Dub one of these the loser arbitrarily?
-        break;
-
-      case SolutionCompareResult::Better:
-        losers[j] = true;
-        break;
-
-      case SolutionCompareResult::Worse:
-        losers[i] = true;
-        break;
-
-      case SolutionCompareResult::Incomparable:
-        break;
-      }
-    }
-  }
-
   // Remove any solution that is worse than some other solution.
   unsigned outIndex = 0;
   for (unsigned i = 0, n = viable.size(); i != n; ++i) {
     // Skip over the losing solutions.
-    if (losers[i])
+    if (viable[i].getFixedScore() > bestScore)
       continue;
 
     // If we have skipped any solutions, move this solution into the next
@@ -1479,6 +1447,7 @@ ConstraintSystem::findBestSolution(SmallVectorImpl<Solution> &viable,
 
     ++outIndex;
   }
+
   viable.erase(viable.begin() + outIndex, viable.end());
   NumDiscardedSolutions += viable.size() - outIndex;
 

lib/Sema/TypeCheckAttr.cpp

@@ -3291,9 +3291,9 @@ void AttributeChecker::checkOriginalDefinedInAttrs(Decl *D,
                AttrName);
       return;
     }
-    if (IntroVer.getValue() >= Attr->MovedVersion) {
+    if (IntroVer.getValue() > Attr->MovedVersion) {
       diagnose(AtLoc,
-               diag::originally_definedin_must_after_available_version,
+               diag::originally_definedin_must_not_before_available_version,
                AttrName);
       return;
     }