Merge pull request #39802 from nate-chandler/basic/graph-node-worklist-rename

[Basic] Renamed GraphNodeWorklist.

Author: nate-chandler

include/swift/Basic/DAGNodeWorklist.h renamed to include/swift/Basic/GraphNodeWorklist.h

@@ -1,4 +1,4 @@
-//===--- DAGNodeWorklist.h --------------------------------------*- C++ -*-===//
+//===--- GraphNodeWorklist.h ------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_BASIC_DAGNODEWORKLIST_H
-#define SWIFT_BASIC_DAGNODEWORKLIST_H
+#ifndef SWIFT_BASIC_GRAPHNODEWORKLIST_H
+#define SWIFT_BASIC_GRAPHNODEWORKLIST_H
 
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/SmallPtrSet.h"
@@ -25,23 +25,22 @@
 ///
 /// The primary API has two methods: intialize() and pop(). Others are provided
 /// for flexibility.
-///
-/// TODO: This also works well for cyclic graph traversal. Particularly CFG
-/// traversal. So we should probably just call it GraphNodeWorklist.
-template <typename T, unsigned SmallSize> struct DAGNodeWorklist {
+template <typename T, unsigned SmallSize>
+struct GraphNodeWorklist {
   llvm::SmallPtrSet<T, SmallSize> nodeVisited;
   llvm::SmallVector<T, SmallSize> nodeVector;
 
-  DAGNodeWorklist() = default;
+  GraphNodeWorklist() = default;
 
-  DAGNodeWorklist(const DAGNodeWorklist &) = delete;
+  GraphNodeWorklist(const GraphNodeWorklist &) = delete;
 
   void initialize(T t) {
     clear();
     insert(t);
   }
 
-  template <typename R> void initializeRange(R &&range) {
+  template <typename R>
+  void initializeRange(R &&range) {
     clear();
     nodeVisited.insert(range.begin(), range.end());
     nodeVector.append(range.begin(), range.end());
@@ -64,4 +63,4 @@ template <typename T, unsigned SmallSize> struct DAGNodeWorklist {
   }
 };
 
-#endif // SWIFT_BASIC_DAGNODEWORKLIST_H
+#endif // SWIFT_BASIC_GRAPHNODEWORKLIST_H

include/swift/SILOptimizer/Utils/CanonicalOSSALifetime.h

@@ -96,7 +96,7 @@
 #ifndef SWIFT_SILOPTIMIZER_UTILS_CANONICALOSSALIFETIME_H
 #define SWIFT_SILOPTIMIZER_UTILS_CANONICALOSSALIFETIME_H
 
-#include "swift/Basic/DAGNodeWorklist.h"
+#include "swift/Basic/GraphNodeWorklist.h"
 #include "swift/Basic/SmallPtrSetVector.h"
 #include "swift/SIL/PrunedLiveness.h"
 #include "swift/SIL/SILInstruction.h"
@@ -271,10 +271,10 @@ class CanonicalizeOSSALifetime {
   llvm::SmallPtrSet<DebugValueInst *, 8> debugValues;
 
   /// Visited set for general def-use traversal that prevents revisiting values.
-  DAGNodeWorklist<SILValue, 8> defUseWorklist;
+  GraphNodeWorklist<SILValue, 8> defUseWorklist;
 
   /// Visited set general CFG traversal that prevents revisiting blocks.
-  DAGNodeWorklist<SILBasicBlock *, 8> blockWorklist;
+  GraphNodeWorklist<SILBasicBlock *, 8> blockWorklist;
 
   /// Pruned liveness for the extended live range including copies. For this
   /// purpose, only consuming instructions are considered "lifetime

include/swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h

@@ -27,7 +27,7 @@
 #ifndef SWIFT_SILOPTIMIZER_UTILS_CANONICALIZEBORROWSCOPES_H
 #define SWIFT_SILOPTIMIZER_UTILS_CANONICALIZEBORROWSCOPES_H
 
-#include "swift/Basic/DAGNodeWorklist.h"
+#include "swift/Basic/GraphNodeWorklist.h"
 #include "swift/Basic/SmallPtrSetVector.h"
 #include "swift/SIL/OwnershipUtils.h"
 #include "swift/SIL/PrunedLiveness.h"
@@ -69,10 +69,10 @@ class CanonicalizeBorrowScope {
   InstructionDeleter &deleter;
 
   /// Visited set for general def-use traversal that prevents revisiting values.
-  DAGNodeWorklist<SILValue, 8> defUseWorklist;
+  GraphNodeWorklist<SILValue, 8> defUseWorklist;
 
   /// Visited set general CFG traversal that prevents revisiting blocks.
-  DAGNodeWorklist<SILBasicBlock *, 8> blockWorklist;
+  GraphNodeWorklist<SILBasicBlock *, 8> blockWorklist;
 
   /// Record any copies outside the borrow scope that were updated. This
   /// includes the outer copy that us used by outer uses and copies for any

lib/SIL/Utils/OwnershipUtils.cpp

@@ -11,9 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/SIL/OwnershipUtils.h"
-#include "swift/Basic/DAGNodeWorklist.h"
 #include "swift/Basic/Defer.h"
-#include "swift/Basic/DAGNodeWorklist.h"
+#include "swift/Basic/GraphNodeWorklist.h"
 #include "swift/Basic/SmallPtrSetVector.h"
 #include "swift/SIL/InstructionUtils.h"
 #include "swift/SIL/LinearLifetimeChecker.h"
@@ -179,7 +178,7 @@ bool swift::findInnerTransitiveGuaranteedUses(
   // grow exponentially without the membership check. It's fine to do this
   // membership check locally in this function (within a borrow scope) because
   // it isn't needed for the immediate uses, only the transitive uses.
-  DAGNodeWorklist<Operand *, 8> worklist;
+  GraphNodeWorklist<Operand *, 8> worklist;
   for (Operand *use : guaranteedValue->getUses()) {
     if (use->getOperandOwnership() != OperandOwnership::NonUse)
       worklist.insert(use);
@@ -1438,7 +1437,7 @@ void swift::findTransitiveReborrowBaseValuePairs(
 void swift::visitTransitiveEndBorrows(
     BorrowedValue beginBorrow,
     function_ref<void(EndBorrowInst *)> visitEndBorrow) {
-  DAGNodeWorklist<SILValue, 4> worklist;
+  GraphNodeWorklist<SILValue, 4> worklist;
   worklist.insert(beginBorrow.value);
 
   while (!worklist.empty()) {

lib/SILOptimizer/Transforms/SILMem2Reg.cpp

@@ -21,7 +21,7 @@
 #define DEBUG_TYPE "sil-mem2reg"
 
 #include "swift/AST/DiagnosticsSIL.h"
-#include "swift/Basic/DAGNodeWorklist.h"
+#include "swift/Basic/GraphNodeWorklist.h"
 #include "swift/SIL/BasicBlockDatastructures.h"
 #include "swift/SIL/Dominance.h"
 #include "swift/SIL/Projection.h"
@@ -1132,7 +1132,7 @@ void StackAllocationPromoter::endLexicalLifetime(BlockSetVector &phiBlocks) {
   using ScopeEndPosition =
       llvm::PointerIntPair<SILBasicBlock *, 1, AvailableValuesKind>;
 
-  DAGNodeWorklist<ScopeEndPosition, 16> worklist;
+  GraphNodeWorklist<ScopeEndPosition, 16> worklist;
   for (auto pair : initializationPoints) {
     worklist.insert({pair.getFirst(), AvailableValuesKind::Out});
   }