fix program point usage

Author: cxy-1993

mlir/include/mlir/Analysis/DataFlowFramework.h

@@ -659,9 +659,8 @@ class DataFlowAnalysis {
   }
 
   /// Add irrelevant program point.
-  template <typename PointT>
-  void addIrrelevantPoint(PointT point) {
-    irrelevantPoints.insert(ProgramPoint(point));
+  void addIrrelevantPoint(ProgramPoint *point) {
+    irrelevantPoints.insert(point);
   }
 
   /// Get a read-only analysis state for the given point and create a dependency
@@ -702,7 +701,7 @@ class DataFlowAnalysis {
 #endif // LLVM_ENABLE_ABI_BREAKING_CHECKS
 
   /// Program points shouldn't analyzed by this analysis.
-  DenseSet<ProgramPoint> irrelevantPoints;
+  DenseSet<ProgramPoint *> irrelevantPoints;
 
 private:
   /// The parent data-flow solver.

mlir/lib/Analysis/DataFlow/DenseAnalysis.cpp

@@ -105,10 +105,10 @@ void AbstractDenseForwardDataFlowAnalysis::visitCallOperation(
 LogicalResult
 AbstractDenseForwardDataFlowAnalysis::processOperation(Operation *op) {
   // Skip irrelavant program points.
-  if (irrelevantPoints.contains(ProgramPoint(op)))
-    return;
-
   ProgramPoint *point = getProgramPointAfter(op);
+  if (irrelevantPoints.contains(point))
+    return success();
+
   // If the containing block is not executable, bail out.
   if (op->getBlock() != nullptr &&
       !getOrCreateFor<Executable>(point, getProgramPointBefore(op->getBlock()))
@@ -338,10 +338,10 @@ void AbstractDenseBackwardDataFlowAnalysis::visitCallOperation(
 LogicalResult
 AbstractDenseBackwardDataFlowAnalysis::processOperation(Operation *op) {
   // Skip irrelavant program points.
-  if (irrelevantPoints.contains(ProgramPoint(op)))
-    return;
-
   ProgramPoint *point = getProgramPointBefore(op);
+  if (irrelevantPoints.contains(point))
+    return success();
+
   // If the containing block is not executable, bail out.
   if (op->getBlock() != nullptr &&
       !getOrCreateFor<Executable>(point, getProgramPointBefore(op->getBlock()))

mlir/test/lib/Analysis/DataFlow/TestDenseBackwardDataFlowAnalysis.cpp

@@ -147,7 +147,7 @@ LogicalResult NextAccessAnalysis::visitOperation(Operation *op,
 
 void NextAccessAnalysis::buildOperationEquivalentLatticeAnchor(Operation *op) {
   if (isMemoryEffectFree(op)) {
-    addIrrelevantPoint(op);
+    addIrrelevantPoint(getProgramPointBefore(op));
     unionLatticeAnchors<NextAccess>(getProgramPointBefore(op),
                                     getProgramPointAfter(op));
   }

mlir/test/lib/Analysis/DataFlow/TestDenseForwardDataFlowAnalysis.cpp

@@ -154,7 +154,7 @@ LogicalResult LastModifiedAnalysis::visitOperation(
 void LastModifiedAnalysis::buildOperationEquivalentLatticeAnchor(
     Operation *op) {
   if (isMemoryEffectFree(op)) {
-    addIrrelevantPoint(op);
+    addIrrelevantPoint(getProgramPointAfter(op));
     unionLatticeAnchors<LastModification>(getProgramPointBefore(op),
                                           getProgramPointAfter(op));
   }