Rename BasicBlock and StmtBlock to Block, and make a pass cleaning it up. I did not make an effort to rename all of the 'bb' names in the codebase, since they are still correct and any specific missed once can be fixed up on demand.

The last major renaming is Statement -> Instruction, which is why Statement and
Stmt still appears in various places.

This is step 19/n towards merging instructions and statements, NFC.

PiperOrigin-RevId: 227163082

1 files changed, 4 insertions, 4 deletions

diff --git a/mlir/lib/Transforms/ComposeAffineMaps.cpp b/mlir/lib/Transforms/ComposeAffineMaps.cpp
index 8c69fa61578..c97b83f8485 100644
--- a/mlir/lib/Transforms/ComposeAffineMaps.cpp
+++ b/mlir/lib/Transforms/ComposeAffineMaps.cpp
@@ -45,8 +45,8 @@ struct ComposeAffineMaps : public FunctionPass, StmtWalker<ComposeAffineMaps> {
   std::vector<OperationInst *> affineApplyOpsToErase;
 
   explicit ComposeAffineMaps() : FunctionPass(&ComposeAffineMaps::passID) {}
-  using StmtListType = llvm::iplist<Statement>;
-  void walk(StmtListType::iterator Start, StmtListType::iterator End);
+  using InstListType = llvm::iplist<Statement>;
+  void walk(InstListType::iterator Start, InstListType::iterator End);
   void visitOperationInst(OperationInst *stmt);
   PassResult runOnMLFunction(Function *f) override;
   using StmtWalker<ComposeAffineMaps>::walk;
@@ -62,8 +62,8 @@ FunctionPass *mlir::createComposeAffineMapsPass() {
   return new ComposeAffineMaps();
 }
 
-void ComposeAffineMaps::walk(StmtListType::iterator Start,
-                             StmtListType::iterator End) {
+void ComposeAffineMaps::walk(InstListType::iterator Start,
+                             InstListType::iterator End) {
   while (Start != End) {
     walk(&(*Start));
     // Increment iterator after walk as visit function can mutate stmt list