https://github.com/tbaederr created
https://github.com/llvm/llvm-project/pull/140546
This matches the diagnostic output of the current interpreter.
>From b13e6121e940c96f42febb327f2ee0191e19faaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbae...@redhat.com>
Date: Mon, 19 May 2025 16:14:49 +0200
Subject: [PATCH] [clang][bytecode] Do not diagnose volatile reads in CPCE mode
This matches the diagnostic output of the current interpreter.
---
clang/lib/AST/ByteCode/Interp.h | 15 ++++++++-------
clang/test/AST/ByteCode/cxx11.cpp | 10 ++++++++++
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h
index 9f1a6302eb856..bfc6797d13412 100644
--- a/clang/lib/AST/ByteCode/Interp.h
+++ b/clang/lib/AST/ByteCode/Interp.h
@@ -2936,13 +2936,14 @@ inline bool InvalidCast(InterpState &S, CodePtr OpPC,
CastKind Kind,
<< static_cast<unsigned>(Kind) << S.Current->getRange(OpPC);
return !Fatal;
} else if (Kind == CastKind::Volatile) {
- // FIXME: Technically not a cast.
- const auto *E = cast<CastExpr>(S.Current->getExpr(OpPC));
- if (S.getLangOpts().CPlusPlus)
- S.FFDiag(E, diag::note_constexpr_access_volatile_type)
- << AK_Read << E->getSubExpr()->getType();
- else
- S.FFDiag(E);
+ if (!S.checkingPotentialConstantExpression()) {
+ const auto *E = cast<CastExpr>(S.Current->getExpr(OpPC));
+ if (S.getLangOpts().CPlusPlus)
+ S.FFDiag(E, diag::note_constexpr_access_volatile_type)
+ << AK_Read << E->getSubExpr()->getType();
+ else
+ S.FFDiag(E);
+ }
return false;
} else if (Kind == CastKind::Dynamic) {
diff --git a/clang/test/AST/ByteCode/cxx11.cpp
b/clang/test/AST/ByteCode/cxx11.cpp
index 88e195c36b583..2a1bda675075c 100644
--- a/clang/test/AST/ByteCode/cxx11.cpp
+++ b/clang/test/AST/ByteCode/cxx11.cpp
@@ -233,3 +233,13 @@ namespace IntToPtrCast {
constexpr intptr_t i = f((intptr_t)&foo - 10); // both-error{{constexpr
variable 'i' must be initialized by a constant expression}} \
//
both-note{{reinterpret_cast}}
}
+
+namespace Volatile {
+ constexpr int f(volatile int &&r) {
+ return r; // both-note {{read of volatile-qualified type 'volatile int'}}
+ }
+ struct S {
+ int j : f(0); // both-error {{constant expression}} \
+ // both-note {{in call to 'f(0)'}}
+ };
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
