https://github.com/mizvekov updated
https://github.com/llvm/llvm-project/pull/101395
>From 9e2dc4d465f2dc3d31bace2fca95b0656538b655 Mon Sep 17 00:00:00 2001
From: Matheus Izvekov <mizve...@gmail.com>
Date: Wed, 31 Jul 2024 16:54:02 -0300
Subject: [PATCH] [clang] create class-type injected NTTP with correct value
kind
A template parameter object is an lvalue, which was not being
respected for injected parameters.
Fixes GH101394
---
clang/docs/ReleaseNotes.rst | 2 ++
clang/lib/AST/ASTContext.cpp | 16 ++++++++++++----
clang/lib/AST/ExprClassification.cpp | 9 +++++----
.../SemaTemplate/temp_arg_template_p0522.cpp | 18 ++++++++++++++++++
4 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 85a2d45031b68..4c7bd099420ab 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -173,6 +173,8 @@ Bug Fixes to C++ Support
- Clang now correctly parses potentially declarative nested-name-specifiers in
pointer-to-member declarators.
- Fix a crash when checking the initialzier of an object that was initialized
with a string literal. (#GH82167)
+- Fix a crash when matching template template parameters with templates which
have
+ parameters of different class type. (#GH101394)
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index b0cc7cb826f97..4c0b2fe9433f8 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -5588,11 +5588,19 @@ TemplateArgument
ASTContext::getInjectedTemplateArg(NamedDecl *Param) {
// of a real template argument.
// FIXME: It would be more faithful to model this as something like an
// lvalue-to-rvalue conversion applied to a const-qualified lvalue.
- if (T->isRecordType())
+ ExprValueKind VK;
+ if (T->isRecordType()) {
+ // C++ [temp.param]p8: An id-expression naming a non-type
+ // template-parameter of class type T denotes a static storage duration
+ // object of type const T.
T.addConst();
- Expr *E = new (*this) DeclRefExpr(
- *this, NTTP, /*RefersToEnclosingVariableOrCapture*/ false, T,
- Expr::getValueKindForType(NTTP->getType()), NTTP->getLocation());
+ VK = VK_LValue;
+ } else {
+ VK = Expr::getValueKindForType(NTTP->getType());
+ }
+ Expr *E = new (*this)
+ DeclRefExpr(*this, NTTP, /*RefersToEnclosingVariableOrCapture=*/false,
+ T, VK, NTTP->getLocation());
if (NTTP->isParameterPack())
E = new (*this)
diff --git a/clang/lib/AST/ExprClassification.cpp
b/clang/lib/AST/ExprClassification.cpp
index 8c5613d28fe76..1f1b8abc09b9e 100644
--- a/clang/lib/AST/ExprClassification.cpp
+++ b/clang/lib/AST/ExprClassification.cpp
@@ -485,12 +485,13 @@ static Cl::Kinds ClassifyInternal(ASTContext &Ctx, const
Expr *E) {
/// ClassifyDecl - Return the classification of an expression referencing the
/// given declaration.
static Cl::Kinds ClassifyDecl(ASTContext &Ctx, const Decl *D) {
- // C++ [expr.prim.general]p6: The result is an lvalue if the entity is a
- // function, variable, or data member and a prvalue otherwise.
+ // C++ [expr.prim.id.unqual]p3: The result is an lvalue if the entity is a
+ // function, variable, or data member, or a template parameter object and a
+ // prvalue otherwise.
// In C, functions are not lvalues.
// In addition, NonTypeTemplateParmDecl derives from VarDecl but isn't an
- // lvalue unless it's a reference type (C++ [temp.param]p6), so we need to
- // special-case this.
+ // lvalue unless it's a reference type or a class type (C++ [temp.param]p8),
+ // so we need to special-case this.
if (const auto *M = dyn_cast<CXXMethodDecl>(D)) {
if (M->isImplicitObjectMemberFunction())
diff --git a/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
b/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
index 251b6fc7d2be1..6f6568b9ab776 100644
--- a/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
+++ b/clang/test/SemaTemplate/temp_arg_template_p0522.cpp
@@ -126,3 +126,21 @@ namespace GH62529 {
template<class T4> B<A, T4> f();
auto t = f<int>();
} // namespace GH62529
+
+namespace GH101394 {
+ struct X {};
+ struct Y {
+ constexpr Y(const X &) {}
+ };
+
+ namespace t1 {
+ template<template<X> class> struct A {};
+ template<Y> struct B;
+ template struct A<B>;
+ } // namespace t1
+ namespace t2 {
+ template<template<Y> class> struct A {};
+ template<X> struct B;
+ template struct A<B>; // expected-error {{different template parameters}}
+ } // namespace t2
+} // namespace GH101394
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
