[flang-commits] [flang] 7d7ebf3 - Fix flang build breakage - trim dependency to AffineUtils

[Uday Bondhugula via flang-commits]

Author: Uday Bondhugula
Date: 2022-02-10T11:33:55+05:30
New Revision: 7d7ebf3cf06e6845dc5b83912f0adecbf69e1123

URL: https://github.com/llvm/llvm-project/commit/7d7ebf3cf06e6845dc5b83912f0adecbf69e1123
DIFF: https://github.com/llvm/llvm-project/commit/7d7ebf3cf06e6845dc5b83912f0adecbf69e1123.diff

LOG: Fix flang build breakage - trim dependency to AffineUtils

There wasn't a need for FIRTransforms to depend on AffineToStandard
conversoin for just an affine utility. The utility was moved to
AffineUtils recently. Fix flang build breakage.

Differential Revision: https://reviews.llvm.org/D119408

Added: 
    

Modified: 
    flang/lib/Optimizer/Transforms/AffineDemotion.cpp
    flang/lib/Optimizer/Transforms/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/lib/Optimizer/Transforms/AffineDemotion.cpp b/flang/lib/Optimizer/Transforms/AffineDemotion.cpp
index bdf73c7e39b88..411db4e5088ea 100644
--- a/flang/lib/Optimizer/Transforms/AffineDemotion.cpp
+++ b/flang/lib/Optimizer/Transforms/AffineDemotion.cpp
@@ -21,8 +21,8 @@
 #include "flang/Optimizer/Dialect/FIROps.h"
 #include "flang/Optimizer/Dialect/FIRType.h"
 #include "flang/Optimizer/Transforms/Passes.h"
-#include "mlir/Conversion/AffineToStandard/AffineToStandard.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
+#include "mlir/Dialect/Affine/Utils.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"

diff  --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt
index 3fb8d0fa8108b..2fec017d5131e 100644
--- a/flang/lib/Optimizer/Transforms/CMakeLists.txt
+++ b/flang/lib/Optimizer/Transforms/CMakeLists.txt
@@ -18,7 +18,7 @@ add_flang_library(FIRTransforms
   LINK_LIBS
   FIRBuilder
   FIRDialect
-  MLIRAffineToStandard
+  MLIRAffineUtils
   MLIRLLVMIR
   MLIROpenACC
   MLIROpenMP