diff --git a/third_party/xla/xla/service/gpu/gemm_rewriter_triton.cc b/third_party/xla/xla/service/gpu/gemm_rewriter_triton.cc
index 187f1891ce0d7f2e67978f073843dd377b165f21..54e8bf3d2c4404ebfe8670adaee31b51d7826bc0 100644
--- a/third_party/xla/xla/service/gpu/gemm_rewriter_triton.cc
+++ b/third_party/xla/xla/service/gpu/gemm_rewriter_triton.cc
@@ -530,25 +530,26 @@ FusionDecision FusionContext::RequireSupportedDimOrder(
   const Fragments& tensor_dim_fragments = order.TensorFragmentsOrder();
   for (const auto& [dim_index, dim_fragments] : order.DimFragmentsOrders()) {
     int split_counter = -1;
-    auto fragment = dim_fragments.cbegin();
+    auto fragment_it = dim_fragments.cbegin();
     while (true) {
-      if (fragment == dim_fragments.cend()) {
+      if (fragment_it == dim_fragments.cend()) {
         break;
       }
-      int64_t grouped_size = tensor_dim_fragments[*fragment].size();
+      int64_t grouped_size = tensor_dim_fragments[*fragment_it].size();
       // Gather contiguous fragments.
-      while ((fragment + 1) != dim_fragments.cend() &&
-             *(fragment + 1) == *fragment + 1) {
-        ++fragment;
-        grouped_size *= tensor_dim_fragments[*fragment].size();
+      while ((fragment_it + 1) != dim_fragments.cend() &&
+             *(fragment_it + 1) == *fragment_it + 1) {
+        ++fragment_it;
+        grouped_size *= tensor_dim_fragments[*fragment_it].size();
       }
 
       if (grouped_size == 1) {
-        ++fragment;
+        ++fragment_it;
         continue;
       }
 
-      if (fragment != dim_fragments.cbegin() && *fragment < *(fragment - 1)) {
+      if (fragment_it != dim_fragments.cbegin() &&
+          *fragment_it < *(fragment_it - 1)) {
         return "Transpose within a dimension.";
       }
 
@@ -570,7 +571,7 @@ FusionDecision FusionContext::RequireSupportedDimOrder(
         }
       }
 
-      ++fragment;
+      ++fragment_it;
     }
   }
   return FusionDecision{};
@@ -811,7 +812,7 @@ DimOrderUpdatesOrError FusionContext::HandleDimensionAlteringOp(
   // Temporary storage for fragments of new dimensions created by reductions.
   std::list<Fragment> new_fragments;
   if (hlo->opcode() == HloOpcode::kTranspose) {
-    const auto transpose = Cast<HloTransposeInstruction>(hlo);
+    const auto* transpose = Cast<HloTransposeInstruction>(hlo);
     std::vector<int64_t> permutation(transpose->dimensions().cbegin(),
                                      transpose->dimensions().cend());
     if (direction == TransformDirection::kInputToOutput) {
@@ -822,13 +823,13 @@ DimOrderUpdatesOrError FusionContext::HandleDimensionAlteringOp(
       dst_logical[permutation[i]] = src_logical[i];
     }
   } else if (hlo->opcode() == HloOpcode::kBroadcast) {
-    const auto broadcast = Cast<HloBroadcastInstruction>(hlo);
+    const auto* broadcast = Cast<HloBroadcastInstruction>(hlo);
     dst_logical.resize(broadcast->dimensions().size());
     for (int i = 0; i < broadcast->dimensions().size(); ++i) {
       dst_logical[i] = src_logical[broadcast->dimensions()[i]];
     }
   } else if (hlo->opcode() == HloOpcode::kReduce) {
-    const auto reduce = Cast<HloReduceInstruction>(hlo);
+    const auto* reduce = Cast<HloReduceInstruction>(hlo);
     dst_logical.resize(src_logical.size() + reduce->dimensions().size());
     if (reduce->dimensions().size() != 1) {
       return FusionDecision("Unsupported reduction.");