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

Author: swift-ci

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -83,13 +83,8 @@ class SimplifyCFG {
   // this set may or may not still be LoopHeaders.
   // (ultimately this can be used to eliminate findLoopHeaders)
   SmallPtrSet<SILBasicBlock *, 4> ClonedLoopHeaders;
-  // The accumulated cost of jump threading per basic block. Initially
-  // zero. Each clone increases the cost by ~ the number of copied instructions.
-  // Effectively multiplying a block's cost is by the number of times it has
-  // been cloned prevents any one block from being cloned indefinitely. Cloned
-  // blocks inherit their original block's current cost to avoid indefinitely
-  // optimizing the newly cloned blocks (primarily relevant for loops where the
-  // number of predecessors can remain the same).
+  // The cost (~ number of copied instructions) of jump threading per basic
+  // block. Used to prevent infinite jump threading loops.
   llvm::SmallDenseMap<SILBasicBlock *, int, 8> JumpThreadingCost;
 
   // Dominance and post-dominance info for the current function
@@ -323,8 +318,6 @@ bool SimplifyCFG::threadEdge(const ThreadInfo &ti) {
     return false;
 
   Cloner.cloneBranchTarget(SrcTerm);
-  JumpThreadingCost[Cloner.getNewBB()] =
-    JumpThreadingCost[SrcTerm->getDestBB()];
 
   // We have copied the threaded block into the edge.
   auto *clonedSrc = Cloner.getNewBB();
@@ -1095,7 +1088,7 @@ bool SimplifyCFG::tryJumpThreading(BranchInst *BI) {
       }
     }
   }
-  // Deduct the prior cost of cloning these blocks (initially zero).
+
   ThreadingBudget -= JumpThreadingCost[SrcBB];
   ThreadingBudget -= JumpThreadingCost[DestBB];
 
@@ -1131,19 +1124,13 @@ bool SimplifyCFG::tryJumpThreading(BranchInst *BI) {
   LLVM_DEBUG(llvm::dbgs() << "jump thread from bb" << SrcBB->getDebugID()
                           << " to bb" << DestBB->getDebugID() << '\n');
 
-  // Accumulate the cost of cloning the block to avoid indefinite cloning.
   JumpThreadingCost[DestBB] += copyCosts;
 
   // Duplicate the destination block into this one, rewriting uses of the BBArgs
   // to use the branch arguments as we go.
   Cloner.cloneBranchTarget(BI);
   Cloner.updateSSAAfterCloning();
 
-  // Also account the costs to the cloned DestBB, so the jump threading cannot
-  // loop by cloning the cloned block again. This is primarily relevant for
-  // loops where the number of predecessors might not decrease with each clone.
-  JumpThreadingCost[Cloner.getNewBB()] += copyCosts;
-
   // Once all the instructions are copied, we can nuke BI itself.  We also add
   // the threaded and edge block to the worklist now that they (likely) can be
   // simplified.
@@ -2886,8 +2873,6 @@ bool SimplifyCFG::tailDuplicateObjCMethodCallSuccessorBlocks() {
     Cloner.cloneBranchTarget(Branch);
     Cloner.updateSSAAfterCloning();
 
-    JumpThreadingCost[Cloner.getNewBB()] = JumpThreadingCost[DestBB];
-
     Changed = true;
     // Simplify the cloned block and continue tail duplicating through its new
     // successors edges.

unittests/runtime/CMakeLists.txt

@@ -1,5 +1,10 @@
+# We can't currently build the runtime tests under ASAN
+# The problem is that we want to use the just-build compiler (just like the
+# runtime) but ASAN will complain if we link against libgtest and LLVMSupport
+# libraries because they were compiled with the host compiler.
 if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
-   ("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "${SWIFT_PRIMARY_VARIANT_ARCH}"))
+  ("${SWIFT_HOST_VARIANT_ARCH}" STREQUAL "${SWIFT_PRIMARY_VARIANT_ARCH}") AND
+  (NOT (LLVM_USE_SANITIZER STREQUAL "Address")))
 
   if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
     if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)