[flang-commits] [flang] [flang] Fix unused variable error (NFC) (PR #188358)

[Kelvin Li via flang-commits]

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

>From 3fa9cf78dfc4a52013a2d90199d87cabe171b768 Mon Sep 17 00:00:00 2001
From: Kelvin Li <kli at ca.ibm.com>
Date: Tue, 24 Mar 2026 16:56:07 -0400
Subject: [PATCH 1/2] [flang] Fix unused variable error (NFC)

---
 flang/lib/Lower/OpenMP/DataSharingProcessor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
index 30ac20efa81a8..03c390c44ba9a 100644
--- a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
+++ b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
@@ -535,10 +535,11 @@ void DataSharingProcessor::collectPrivatizedSymbols(
   };
 
   llvm::SetVector<const semantics::Scope *> clauseScopes;
-  const semantics::Scope *curScope = collectScopes(semaCtx, eval, clauseScopes);
+  [[maybe_unused]] const semantics::Scope *curScope =
+      collectScopes(semaCtx, eval, clauseScopes);
+  assert(curScope && "couldn't find current scope");
 
   for (const auto *sym : allSymbols) {
-    assert(curScope && "couldn't find current scope");
     if (semantics::omp::IsPrivatizable(*sym) &&
         // Linear symbols are privatized by OpenMP IRBuilder. See comments
         // in collectSymbolsForPrivatization() for more details.

>From 9bae180edf6745aa4fbf21071d699936bbb8e61b Mon Sep 17 00:00:00 2001
From: Kelvin Li <kli at ca.ibm.com>
Date: Wed, 25 Mar 2026 13:52:26 -0400
Subject: [PATCH 2/2] Remove curScope

---
 flang/lib/Lower/OpenMP/DataSharingProcessor.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
index 03c390c44ba9a..c6f6b84c8b7cc 100644
--- a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
+++ b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp
@@ -535,9 +535,7 @@ void DataSharingProcessor::collectPrivatizedSymbols(
   };
 
   llvm::SetVector<const semantics::Scope *> clauseScopes;
-  [[maybe_unused]] const semantics::Scope *curScope =
-      collectScopes(semaCtx, eval, clauseScopes);
-  assert(curScope && "couldn't find current scope");
+  (void)collectScopes(semaCtx, eval, clauseScopes);
 
   for (const auto *sym : allSymbols) {
     if (semantics::omp::IsPrivatizable(*sym) &&