https://github.com/efriedma-quic updated
https://github.com/llvm/llvm-project/pull/146288
>From c678e8f0978480fadf3f7d2ffc30cd1d8229a9fa Mon Sep 17 00:00:00 2001
From: Eli Friedman <efrie...@quicinc.com>
Date: Sun, 29 Jun 2025 12:30:28 -0700
Subject: [PATCH 1/4] [clang] Improve constexpr-unknown diagnostics.
APValue::ConstexprUnknown() constructs a broken LValue that doesn't
have an lvalue path, which confuses later error handling. It turns out
we don't actually use the result of createConstexprUnknownAPValues for
anything, so just stop using it. Just construct the LValue directly when
we need it.
Make findCompleteObject emit errors more aggressively; allowing it to
succeed for constexpr-unknown objects leads to weird states where it
succeeds, but doesn't return a well-formed object.
Delete the check for constexpr-unknown in dynamic_cast handling: it's
not necessary, and breaks with the other changes in this patch.
These changes allow us to produce proper diagnostics when something
fails to be evaluated, instead of just printing a generic top-level
error without any notes.
---
.../include/clang/Basic/DiagnosticASTKinds.td | 2 +
clang/lib/AST/ExprConstant.cpp | 59 +++++++------------
.../SemaCXX/constant-expression-cxx11.cpp | 6 +-
.../SemaCXX/constant-expression-p2280r4.cpp | 58 ++++++++++++++++--
4 files changed, 79 insertions(+), 46 deletions(-)
diff --git a/clang/include/clang/Basic/DiagnosticASTKinds.td
b/clang/include/clang/Basic/DiagnosticASTKinds.td
index d2cd86d05d55a..2e2a9597ccb5f 100644
--- a/clang/include/clang/Basic/DiagnosticASTKinds.td
+++ b/clang/include/clang/Basic/DiagnosticASTKinds.td
@@ -240,6 +240,8 @@ def note_constexpr_access_static_temporary : Note<
"outside the expression that created the temporary">;
def note_constexpr_access_unreadable_object : Note<
"%sub{access_kind}0 object '%1' whose value is not known">;
+def note_constexpr_access_unknown_variable : Note<
+ "%sub{access_kind}0 variable %1 whose value is not known">;
def note_constexpr_access_deleted_object : Note<
"%sub{access_kind}0 heap allocated object that has been deleted">;
def note_constexpr_modify_global : Note<
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index bf9208763b1ab..f9453658580c9 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -202,7 +202,9 @@ namespace {
assert(!isBaseAnAllocSizeCall(Base) &&
"Unsized arrays shouldn't appear here");
unsigned MostDerivedLength = 0;
- Type = getType(Base);
+ // The type of Base is a reference type if the base is a constexpr-unknown
+ // variable. In that case, look through the reference type.
+ Type = getType(Base).getNonReferenceType();
for (unsigned I = 0, N = Path.size(); I != N; ++I) {
if (Type->isArrayType()) {
@@ -571,7 +573,6 @@ namespace {
typedef std::map<MapKeyTy, APValue> MapTy;
/// Temporaries - Temporary lvalues materialized within this stack frame.
MapTy Temporaries;
- MapTy ConstexprUnknownAPValues;
/// CallRange - The source range of the call expression for this call.
SourceRange CallRange;
@@ -646,9 +647,6 @@ namespace {
APValue &createTemporary(const KeyT *Key, QualType T,
ScopeKind Scope, LValue &LV);
- APValue &createConstexprUnknownAPValues(const VarDecl *Key,
- APValue::LValueBase Base);
-
/// Allocate storage for a parameter of a function call made in this frame.
APValue &createParam(CallRef Args, const ParmVarDecl *PVD, LValue &LV);
@@ -1955,15 +1953,6 @@ APValue &CallStackFrame::createTemporary(const KeyT
*Key, QualType T,
return createLocal(Base, Key, T, Scope);
}
-APValue &
-CallStackFrame::createConstexprUnknownAPValues(const VarDecl *Key,
- APValue::LValueBase Base) {
- APValue &Result = ConstexprUnknownAPValues[MapKeyTy(Key, Base.getVersion())];
- Result = APValue(Base, CharUnits::Zero(), APValue::ConstexprUnknown{});
-
- return Result;
-}
-
/// Allocate storage for a parameter of a function call made in this frame.
APValue &CallStackFrame::createParam(CallRef Args, const ParmVarDecl *PVD,
LValue &LV) {
@@ -3493,7 +3482,7 @@ static bool evaluateVarDeclInit(EvalInfo &Info, const
Expr *E,
APValue::LValueBase Base(VD, Frame ? Frame->Index : 0, Version);
auto CheckUninitReference = [&](bool IsLocalVariable) {
- if (!Result->hasValue() && VD->getType()->isReferenceType()) {
+ if (!Result || (!Result->hasValue() && VD->getType()->isReferenceType())) {
// C++23 [expr.const]p8
// ... For such an object that is not usable in constant expressions, the
// dynamic type of the object is constexpr-unknown. For such a reference
@@ -3509,7 +3498,7 @@ static bool evaluateVarDeclInit(EvalInfo &Info, const
Expr *E,
Info.FFDiag(E, diag::note_constexpr_use_uninit_reference);
return false;
}
- Result = &Info.CurrentCall->createConstexprUnknownAPValues(VD, Base);
+ Result = nullptr;
}
return true;
};
@@ -3552,7 +3541,7 @@ static bool evaluateVarDeclInit(EvalInfo &Info, const
Expr *E,
// ... its lifetime began within the evaluation of E;
if (isa<ParmVarDecl>(VD)) {
if (AllowConstexprUnknown) {
- Result = &Info.CurrentCall->createConstexprUnknownAPValues(VD, Base);
+ Result = nullptr;
return true;
}
@@ -3659,12 +3648,8 @@ static bool evaluateVarDeclInit(EvalInfo &Info, const
Expr *E,
Result = VD->getEvaluatedValue();
- if (!Result) {
- if (AllowConstexprUnknown)
- Result = &Info.CurrentCall->createConstexprUnknownAPValues(VD, Base);
- else
- return false;
- }
+ if (!Result && !AllowConstexprUnknown)
+ return false;
return CheckUninitReference(/*IsLocalVariable=*/false);
}
@@ -3947,11 +3932,6 @@ findSubobject(EvalInfo &Info, const Expr *E, const
CompleteObject &Obj,
const FieldDecl *LastField = nullptr;
const FieldDecl *VolatileField = nullptr;
- // C++23 [expr.const]p8 If we have an unknown reference or pointers and it
- // does not have a value then bail out.
- if (O->allowConstexprUnknown() && !O->hasValue())
- return false;
-
// Walk the designator's path to find the subobject.
for (unsigned I = 0, N = Sub.Entries.size(); /**/; ++I) {
// Reading an indeterminate value is undefined, but assigning over one is
OK.
@@ -4491,6 +4471,14 @@ static CompleteObject findCompleteObject(EvalInfo &Info,
const Expr *E,
if (!evaluateVarDeclInit(Info, E, VD, Frame, LVal.getLValueVersion(),
BaseVal))
return CompleteObject();
+ // If evaluateVarDeclInit sees a constexpr-unknown variable, it returns
+ // a null BaseVal. Any constexpr-unknown variable seen here is an error:
+ // we can't access a constexpr-unknown object.
+ if (!BaseVal) {
+ Info.FFDiag(E, diag::note_constexpr_access_unknown_variable, 1) << AK <<
VD;
+ Info.Note(VD->getLocation(), diag::note_declared_at);
+ return CompleteObject();
+ }
} else if (DynamicAllocLValue DA = LVal.Base.dyn_cast<DynamicAllocLValue>())
{
std::optional<DynAlloc *> Alloc = Info.lookupDynamicAlloc(DA);
if (!Alloc) {
@@ -6057,15 +6045,6 @@ struct CheckDynamicTypeHandler {
/// dynamic type.
static bool checkDynamicType(EvalInfo &Info, const Expr *E, const LValue &This,
AccessKinds AK, bool Polymorphic) {
- // We are not allowed to invoke a virtual function whose dynamic type
- // is constexpr-unknown, so stop early and let this fail later on if we
- // attempt to do so.
- // C++23 [expr.const]p5.6
- // an invocation of a virtual function ([class.virtual]) for an object whose
- // dynamic type is constexpr-unknown;
- if (This.allowConstexprUnknown())
- return true;
-
if (This.Designator.Invalid)
return false;
@@ -9063,6 +9042,12 @@ bool LValueExprEvaluator::VisitVarDecl(const Expr *E,
const VarDecl *VD) {
if (!evaluateVarDeclInit(Info, E, VD, Frame, Version, V))
return false;
+ if (!V) {
+ Result.set(VD);
+ Result.AllowConstexprUnknown = true;
+ return true;
+ }
+
return Success(*V, E);
}
diff --git a/clang/test/SemaCXX/constant-expression-cxx11.cpp
b/clang/test/SemaCXX/constant-expression-cxx11.cpp
index ab4e50072f654..c390fee1c38d9 100644
--- a/clang/test/SemaCXX/constant-expression-cxx11.cpp
+++ b/clang/test/SemaCXX/constant-expression-cxx11.cpp
@@ -1466,7 +1466,7 @@ namespace InstantiateCaseStmt {
namespace ConvertedConstantExpr {
extern int &m;
- extern int &n; // pre-cxx23-note 2{{declared here}}
+ extern int &n; // expected-note 2{{declared here}}
constexpr int k = 4;
int &m = const_cast<int&>(k);
@@ -1475,9 +1475,9 @@ namespace ConvertedConstantExpr {
// useless note and instead just point to the non-constant subexpression.
enum class E {
em = m,
- en = n, // expected-error {{enumerator value is not a constant
expression}} cxx11_20-note {{initializer of 'n' is unknown}}
+ en = n, // expected-error {{enumerator value is not a constant
expression}} cxx11_20-note {{initializer of 'n' is unknown}} cxx23-note {{read
of non-constexpr variable 'n'}}
eo = (m + // expected-error {{not a constant expression}}
- n // cxx11_20-note {{initializer of 'n' is unknown}}
+ n // cxx11_20-note {{initializer of 'n' is unknown}} cxx23-note
{{read of non-constexpr variable 'n'}}
),
eq = reinterpret_cast<long>((int*)0) // expected-error {{not a constant
expression}} expected-note {{reinterpret_cast}}
};
diff --git a/clang/test/SemaCXX/constant-expression-p2280r4.cpp
b/clang/test/SemaCXX/constant-expression-p2280r4.cpp
index 50637917ba210..ec545c2973f15 100644
--- a/clang/test/SemaCXX/constant-expression-p2280r4.cpp
+++ b/clang/test/SemaCXX/constant-expression-p2280r4.cpp
@@ -35,7 +35,7 @@ constexpr int how_many(Swim& swam) {
return (p + 1 - 1)->phelps();
}
-void splash(Swim& swam) {
+void splash(Swim& swam) { // nointerpreter-note {{declared
here}}
static_assert(swam.phelps() == 28); // ok
static_assert((&swam)->phelps() == 28); // ok
Swim* pswam = &swam; // expected-note {{declared here}}
@@ -43,8 +43,10 @@ void splash(Swim& swam) {
// expected-note {{read of
non-constexpr variable 'pswam' is not allowed in a constant expression}}
static_assert(how_many(swam) == 28); // ok
static_assert(Swim().lochte() == 12); // ok
- static_assert(swam.lochte() == 12); // expected-error {{static assertion
expression is not an integral constant expression}}
- static_assert(swam.coughlin == 12); // expected-error {{static assertion
expression is not an integral constant expression}}
+ static_assert(swam.lochte() == 12); // expected-error {{static assertion
expression is not an integral constant expression}} \
+ // nointerpreter-note {{virtual
function called on object 'swam' whose dynamic type is not constant}}
+ static_assert(swam.coughlin == 12); // expected-error {{static assertion
expression is not an integral constant expression}} \
+ // nointerpreter-note {{read of
variable 'swam' whose value is not known}}
}
extern Swim dc;
@@ -253,12 +255,56 @@ namespace uninit_reference_used {
namespace param_reference {
constexpr int arbitrary = -12345;
- constexpr void f(const int &x = arbitrary) { // expected-note {{declared
here}}
+ constexpr void f(const int &x = arbitrary) { // nointerpreter-note 3
{{declared here}} interpreter-note {{declared here}}
constexpr const int &v1 = x; // expected-error {{must be initialized by a
constant expression}} \
// expected-note {{reference to 'x' is not a constant expression}}
constexpr const int &v2 = (x, arbitrary); // expected-warning {{left
operand of comma operator has no effect}}
- constexpr int v3 = x; // expected-error {{must be initialized by a
constant expression}}
- static_assert(x==arbitrary); // expected-error {{static assertion
expression is not an integral constant expression}}
+ constexpr int v3 = x; // expected-error {{must be initialized by a
constant expression}} \
+ // nointerpreter-note {{read of variable 'x' whose
value is not known}}
+ static_assert(x==arbitrary); // expected-error {{static assertion
expression is not an integral constant expression}} \
+ // nointerpreter-note {{read of variable 'x'
whose value is not known}}
static_assert(&x - &x == 0);
}
}
+
+namespace dropped_note {
+ extern int &x; // expected-note {{declared here}}
+ constexpr int f() { return x; } // nointerpreter-note {{read of
non-constexpr variable 'x'}} \
+ // interpreter-note {{initializer of 'x' is
unknown}}
+ constexpr int y = f(); // expected-error {{constexpr variable 'y' must be
initialized by a constant expression}} expected-note {{in call to 'f()'}}
+}
+
+namespace dynamic {
+ struct A {virtual ~A();};
+ struct B : A {};
+ void f(A& a) {
+ constexpr B* b = dynamic_cast<B*>(&a); // expected-error {{must be
initialized by a constant expression}} \
+ // nointerpreter-note
{{dynamic_cast applied to object 'a' whose dynamic type is not constant}}
+ constexpr void* b2 = dynamic_cast<void*>(&a); // expected-error {{must be
initialized by a constant expression}} \
+ // nointerpreter-note
{{dynamic_cast applied to object 'a' whose dynamic type is not constant}}
+ }
+}
+
+namespace pointer_comparisons {
+ extern int &extern_n; // interpreter-note 2 {{declared here}}
+ extern int &extern_n2;
+ constexpr int f1(bool b, int& n) {
+ if (b) {
+ return &extern_n == &n;
+ }
+ return f1(true, n);
+ }
+ // FIXME: interpreter incorrectly rejects; both sides are the same
constexpr-unknown value.
+ static_assert(f1(false, extern_n)); // interpreter-error {{static assertion
expression is not an integral constant expression}} \
+ // interpreter-note {{initializer of
'extern_n' is unknown}}
+ // FIXME: We should diagnose this: we don't know if the references bind
+ // to the same object.
+ static_assert(&extern_n != &extern_n2); // interpreter-error {{static
assertion expression is not an integral constant expression}} \
+ // interpreter-note {{initializer of
'extern_n' is unknown}}
+ void f2(const int &n) {
+ // FIXME: We should not diagnose this: the two objects provably have
+ // different addresses because the lifetime of "n" extends across
+ // the initialization.
+ constexpr int x = &x == &n; // nointerpreter-error {{must be initialized
by a constant expression}}
+ }
+}
>From e5eb2686020c4a5b255c8abb00e3a0697c1cefc4 Mon Sep 17 00:00:00 2001
From: Eli Friedman <efrie...@quicinc.com>
Date: Sun, 29 Jun 2025 17:24:00 -0700
Subject: [PATCH 2/4] Fix formatting
---
clang/lib/AST/ExprConstant.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index f9453658580c9..a59d0b9fab0bd 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -4475,7 +4475,8 @@ static CompleteObject findCompleteObject(EvalInfo &Info,
const Expr *E,
// a null BaseVal. Any constexpr-unknown variable seen here is an error:
// we can't access a constexpr-unknown object.
if (!BaseVal) {
- Info.FFDiag(E, diag::note_constexpr_access_unknown_variable, 1) << AK <<
VD;
+ Info.FFDiag(E, diag::note_constexpr_access_unknown_variable, 1)
+ << AK << VD;
Info.Note(VD->getLocation(), diag::note_declared_at);
return CompleteObject();
}
>From 028e9c2046f3e1e78b8b1b39add2ddd10a4f1c59 Mon Sep 17 00:00:00 2001
From: Eli Friedman <efrie...@quicinc.com>
Date: Sun, 29 Jun 2025 17:44:55 -0700
Subject: [PATCH 3/4] Fix crash with constexpr-unknown unsized array
---
clang/lib/AST/APValue.cpp | 2 +-
clang/lib/AST/ExprConstant.cpp | 3 ++-
clang/test/SemaCXX/constant-expression-p2280r4.cpp | 8 ++++++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/clang/lib/AST/APValue.cpp b/clang/lib/AST/APValue.cpp
index c641ff6b99bab..ee3dc84479fd9 100644
--- a/clang/lib/AST/APValue.cpp
+++ b/clang/lib/AST/APValue.cpp
@@ -821,7 +821,7 @@ void APValue::printPretty(raw_ostream &Out, const
PrintingPolicy &Policy,
else if (isLValueOnePastTheEnd())
Out << "*(&";
- QualType ElemTy = Base.getType();
+ QualType ElemTy = Base.getType().getNonReferenceType();
if (const ValueDecl *VD = Base.dyn_cast<const ValueDecl*>()) {
Out << *VD;
} else if (TypeInfoLValue TI = Base.dyn_cast<TypeInfoLValue>()) {
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index a59d0b9fab0bd..134526c1014f8 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -1754,7 +1754,8 @@ namespace {
return;
}
if (checkSubobject(Info, E, CSK_ArrayToPointer)) {
- assert(getType(Base)->isPointerType() || getType(Base)->isArrayType());
+ assert(getType(Base).getNonReferenceType()->isPointerType() ||
+ getType(Base).getNonReferenceType()->isArrayType());
Designator.FirstEntryIsAnUnsizedArray = true;
Designator.addUnsizedArrayUnchecked(ElemTy);
}
diff --git a/clang/test/SemaCXX/constant-expression-p2280r4.cpp
b/clang/test/SemaCXX/constant-expression-p2280r4.cpp
index ec545c2973f15..02eac7c79fabd 100644
--- a/clang/test/SemaCXX/constant-expression-p2280r4.cpp
+++ b/clang/test/SemaCXX/constant-expression-p2280r4.cpp
@@ -285,6 +285,14 @@ namespace dynamic {
}
}
+namespace unsized_array {
+ void f(int (&a)[], int (&b)[]) {
+ constexpr int t1 = a - a;
+ constexpr int t2 = a - b; // expected-error {{constexpr variable 't2' must
be initialized by a constant expression}}
+ // expected-note {{arithmetic involving
unrelated objects '&a[0]' and '&b[0]' has unspecified value}}
+ }
+}
+
namespace pointer_comparisons {
extern int &extern_n; // interpreter-note 2 {{declared here}}
extern int &extern_n2;
>From cf30130162a045ccbd2d05f4e5972a9ca4374534 Mon Sep 17 00:00:00 2001
From: Eli Friedman <efrie...@quicinc.com>
Date: Sun, 29 Jun 2025 20:56:15 -0700
Subject: [PATCH 4/4] Fixup tests.
---
clang/test/SemaCXX/constant-expression-p2280r4.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/clang/test/SemaCXX/constant-expression-p2280r4.cpp
b/clang/test/SemaCXX/constant-expression-p2280r4.cpp
index 02eac7c79fabd..f6c7907f2d4a6 100644
--- a/clang/test/SemaCXX/constant-expression-p2280r4.cpp
+++ b/clang/test/SemaCXX/constant-expression-p2280r4.cpp
@@ -286,10 +286,14 @@ namespace dynamic {
}
namespace unsized_array {
- void f(int (&a)[], int (&b)[]) {
+ void f(int (&a)[], int (&b)[], int (&c)[4]) {
constexpr int t1 = a - a;
- constexpr int t2 = a - b; // expected-error {{constexpr variable 't2' must
be initialized by a constant expression}}
- // expected-note {{arithmetic involving
unrelated objects '&a[0]' and '&b[0]' has unspecified value}}
+ constexpr int t2 = a - b; // expected-error {{constexpr variable 't2' must
be initialized by a constant expression}} \
+ // nointerpreter-note {{arithmetic involving
unrelated objects '&a[0]' and '&b[0]' has unspecified value}} \
+ // interpreter-note {{arithmetic involving
unrelated objects 'a' and 'b' has unspecified value}}
+ constexpr int t3 = a - &c[2]; // expected-error {{constexpr variable 't3'
must be initialized by a constant expression}} \
+ // nointerpreter-note {{arithmetic involving
unrelated objects '&a[0]' and '&c[2]' has unspecified value}} \
+ // interpreter-note {{arithmetic involving
unrelated objects 'a' and '*((char*)&c + 8)' has unspecified value}}
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
