[clang] [NFC] Rename 'Expr' to 'RefExpr' to fix the build warnings (PR #164828)

Erich Keane via cfe-commits cfe-commits at lists.llvm.org
Thu Oct 23 07:40:13 PDT 2025


https://github.com/erichkeane created https://github.com/llvm/llvm-project/pull/164828

I used 'expr' since that is what it is in the standard, but that obviously conflicts with our warnings on some build bots. This patch fixes that by renaming it.

>From 5610c61d72eb11a77919bcd08cd6351d1a20df6c Mon Sep 17 00:00:00 2001
From: erichkeane <ekeane at nvidia.com>
Date: Thu, 23 Oct 2025 07:37:14 -0700
Subject: [PATCH] [NFC] Rename 'Expr' to 'RefExpr' to fix the build warnings

I used 'expr' since that is what it is in the standard, but that
obviously conflicts with our warnings on some build bots. This patch
fixes that by renaming it.
---
 clang/include/clang/AST/StmtOpenACC.h       | 4 +++-
 clang/lib/CIR/CodeGen/CIRGenStmtOpenACC.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/clang/include/clang/AST/StmtOpenACC.h b/clang/include/clang/AST/StmtOpenACC.h
index f5240251b67af..ae8029797a36e 100644
--- a/clang/include/clang/AST/StmtOpenACC.h
+++ b/clang/include/clang/AST/StmtOpenACC.h
@@ -821,7 +821,9 @@ class OpenACCAtomicConstruct final
   struct StmtInfo {
     const Expr *V;
     const Expr *X;
-    const Expr *Expr;
+    // Listed as 'expr' in the standard, this is typically a generic expression
+    // as a component.
+    const Expr *RefExpr;
     // TODO: OpenACC: We should expand this as we're implementing the other
     // atomic construct kinds.
   };
diff --git a/clang/lib/CIR/CodeGen/CIRGenStmtOpenACC.cpp b/clang/lib/CIR/CodeGen/CIRGenStmtOpenACC.cpp
index b125330321afd..349b111c0d8fd 100644
--- a/clang/lib/CIR/CodeGen/CIRGenStmtOpenACC.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenStmtOpenACC.cpp
@@ -346,7 +346,7 @@ CIRGenFunction::emitOpenACCAtomicConstruct(const OpenACCAtomicConstruct &s) {
   }
   case OpenACCAtomicKind::Write: {
     mlir::Value x = emitLValue(inf.X).getPointer();
-    mlir::Value expr = emitAnyExpr(inf.Expr).getValue();
+    mlir::Value expr = emitAnyExpr(inf.RefExpr).getValue();
     auto op = mlir::acc::AtomicWriteOp::create(builder, start, x, expr,
                                                /*ifCond=*/{});
     emitOpenACCClauses(op, s.getDirectiveKind(), s.getDirectiveLoc(),



More information about the cfe-commits mailing list