[flang-commits] [flang] [flang] fix unused variable (NFC) (PR #227768)

[Kelvin Li via flang-commits]

https://github.com/kkwli updated https://github.com/llvm/llvm-project/pull/227768

>From 7495d08476dbace4e9cd3ac43e9ac54421e40695 Mon Sep 17 00:00:00 2001
From: Kelvin Li <kli at ca.ibm.com>
Date: Wed, 30 Sep 2026 12:07:35 -0400
Subject: [PATCH 1/2] [flang] fix unused variable (NFC)

---
 flang/lib/Lower/ConvertCall.cpp                    | 4 ++--
 flang/lib/Lower/PFTBuilder.cpp                     | 4 ++--
 flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flang/lib/Lower/ConvertCall.cpp b/flang/lib/Lower/ConvertCall.cpp
index f2ce4b20803dd..6cb12b8208203 100644
--- a/flang/lib/Lower/ConvertCall.cpp
+++ b/flang/lib/Lower/ConvertCall.cpp
@@ -1462,8 +1462,8 @@ static PreparedDummyArgument preparePresentUserCallActualArgument(
   // Helpers to generate hlfir.copy_in operation and register the related
   // hlfir.copy_out creation.
   auto genCopyIn = [&](hlfir::Entity var, bool doCopyOut) -> hlfir::Entity {
-    auto baseBoxTy = mlir::dyn_cast<fir::BaseBoxType>(var.getType());
-    assert(baseBoxTy && "expect non simply contiguous variables to be boxes");
+    assert(mlir::dyn_cast<fir::BaseBoxType>(var.getType()) &&
+           "expect non simply contiguous variables to be boxes");
     mlir::Value tempBox = builder.createTemporary(loc, var.getType());
     auto copyIn = hlfir::CopyInOp::create(builder, loc, var, tempBox,
                                           /*var_is_present=*/mlir::Value{});
diff --git a/flang/lib/Lower/PFTBuilder.cpp b/flang/lib/Lower/PFTBuilder.cpp
index 2bbf6eebc2c73..536ba708b1916 100644
--- a/flang/lib/Lower/PFTBuilder.cpp
+++ b/flang/lib/Lower/PFTBuilder.cpp
@@ -1117,8 +1117,8 @@ class PFTBuilder {
           },
           [&](const parser::AssignStmt &s) { // legacy label assignment
             auto &label = std::get<parser::Label>(s.t);
-            const auto *sym = std::get<parser::Name>(s.t).symbol;
-            assert(sym && "missing AssignStmt symbol");
+            assert(std::get<parser::Name>(s.t).symbol &&
+                   "missing AssignStmt symbol");
             auto labelIter{labelEvaluationMap->find(label)};
             assert(labelIter != labelEvaluationMap->end() &&
                    "assigned label has no evaluation");
diff --git a/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp b/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp
index dfbf014f95b43..388b692b3f741 100644
--- a/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp
+++ b/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp
@@ -1605,7 +1605,7 @@ class MapInfoFinalizationPass
     // Make sure that updateUseDeviceDescriptorArgs was launched earlier
     auto arg = getUseDeviceAddrBlockArg(mapOp, *targetDataOp.getOperation());
     bool isArgBoxType = mlir::isa<fir::BaseBoxType>(arg.getType());
-    bool useArgLoad =
+    [[maybe_unused]] bool useArgLoad =
         arg.hasOneUse() && mlir::isa<fir::LoadOp>(*arg.use_begin()->getOwner());
     assert((isArgBoxType || useArgLoad) &&
            "Expected either BaseBox item or Load operation");

>From e745adea62649f573bf8cf3d64af7c2accb1ad9f Mon Sep 17 00:00:00 2001
From: Kelvin Li <kli at ca.ibm.com>
Date: Wed, 30 Sep 2026 15:14:31 -0400
Subject: [PATCH 2/2] trigger CI build