diff --git a/mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h b/mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h
--- a/mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h
+++ b/mlir/include/mlir/Analysis/BufferViewFlowAnalysis.h
@@ -39,10 +39,10 @@
   /// Returns the end iterator that can be used in combination with find.
   ValueMapT::const_iterator end() const { return dependencies.end(); }
 
-  /// Find all immediate and indirect views upong this value. This will find all
+  /// Find all immediate and indirect views upon this value. This will find all
   /// dependencies on this value that can potentially be later in the execution
   /// of the program, but will not return values that this alias might have been
-  /// created from (such as if `value is created by a subview, this will not
+  /// created from (such as if the value is created by a subview, this will not
   /// return the parent view if there is no cyclic behavior). Note that the
   /// resulting set will also contain the value provided as it is an alias of
   /// itself.
diff --git a/mlir/lib/Analysis/BufferViewFlowAnalysis.cpp b/mlir/lib/Analysis/BufferViewFlowAnalysis.cpp
--- a/mlir/lib/Analysis/BufferViewFlowAnalysis.cpp
+++ b/mlir/lib/Analysis/BufferViewFlowAnalysis.cpp
@@ -104,10 +104,10 @@
         // Iterate over all immediate terminator operations and wire the
         // successor inputs with the operands of each terminator.
         for (Block &block : region) {
-          for (Operation &operation : block) {
-            if (operation.hasTrait<OpTrait::ReturnLike>())
-              registerDependencies(operation.getOperands(),
-                                   successorRegion.getSuccessorInputs());
+          Operation &terminator = *block.getTerminator();
+          if (terminator.hasTrait<OpTrait::ReturnLike>()) {
+            registerDependencies(terminator.getOperands(),
+                                 successorRegion.getSuccessorInputs());
           }
         }
       }