[clang] [Clang][Sema] fix crash in codegen stage when an lambda expression declared in an unevaluated context (PR #80802)
Qizhi Hu via cfe-commits
cfe-commits at lists.llvm.org
Thu Feb 8 03:29:12 PST 2024
https://github.com/jcsxky updated https://github.com/llvm/llvm-project/pull/80802
>From 2b55af4e11a637e268e498242041cb0fe482e375 Mon Sep 17 00:00:00 2001
From: huqizhi <huqizhi at feysh.com>
Date: Tue, 6 Feb 2024 14:06:40 +0800
Subject: [PATCH] [Clang][Sema] fix crash in codegen stage when an lambda
expression declared in an unevaluated context
---
clang/docs/ReleaseNotes.rst | 2 ++
clang/lib/Sema/SemaTemplateInstantiate.cpp | 29 ++++++++++++++++++++--
clang/test/CodeGen/PR76674.cpp | 11 ++++++++
3 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644 clang/test/CodeGen/PR76674.cpp
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 4d57ea4fd55b8..7ad575e4f57fa 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -204,6 +204,8 @@ Bug Fixes to C++ Support
parameter where we did an incorrect specialization of the initialization of
the default parameter.
Fixes (`#68490 <https://github.com/llvm/llvm-project/issues/68490>`_)
+- Fix a crash in codegen when lambdas declared in an unevaluated context.
+ Fixes (`#76674 <https://github.com/llvm/llvm-project/issues/76674>`_)
Bug Fixes to AST Handling
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index 6d59180bc446d..b7dd80b3e2457 100644
--- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -16,6 +16,7 @@
#include "clang/AST/ASTLambda.h"
#include "clang/AST/ASTMutationListener.h"
#include "clang/AST/DeclBase.h"
+#include "clang/AST/DeclCXX.h"
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprConcepts.h"
@@ -1614,7 +1615,19 @@ bool TemplateInstantiator::AlreadyTransformed(QualType T) {
if (T.isNull())
return true;
- if (T->isInstantiationDependentType() || T->isVariablyModifiedType())
+ bool DependentLambdaType = false;
+ QualType DesugaredType = T.getDesugaredType(SemaRef.getASTContext());
+ CXXRecordDecl *RD = DesugaredType->getAsCXXRecordDecl();
+ if (RD && RD->isLambda()) {
+ QualType LambdaCallType = RD->getLambdaCallOperator()->getType();
+ if (LambdaCallType->isInstantiationDependentType() ||
+ LambdaCallType->isVariablyModifiedType()) {
+ DependentLambdaType = true;
+ }
+ }
+
+ if (T->isInstantiationDependentType() || T->isVariablyModifiedType() ||
+ DependentLambdaType)
return false;
getSema().MarkDeclarationsReferencedInType(Loc, T);
@@ -2683,9 +2696,21 @@ QualType Sema::SubstType(QualType T,
"Cannot perform an instantiation without some context on the "
"instantiation stack");
+ bool DependentLambdaType = false;
+ QualType DesugaredType = T.getDesugaredType(getASTContext());
+ CXXRecordDecl *RD = DesugaredType->getAsCXXRecordDecl();
+ if (RD && RD->isLambda()) {
+ QualType LambdaCallType = RD->getLambdaCallOperator()->getType();
+ if (LambdaCallType->isInstantiationDependentType() ||
+ LambdaCallType->isVariablyModifiedType()) {
+ DependentLambdaType = true;
+ }
+ }
+
// If T is not a dependent type or a variably-modified type, there
// is nothing to do.
- if (!T->isInstantiationDependentType() && !T->isVariablyModifiedType())
+ if (!T->isInstantiationDependentType() && !T->isVariablyModifiedType() &&
+ !DependentLambdaType)
return T;
TemplateInstantiator Instantiator(*this, TemplateArgs, Loc, Entity);
diff --git a/clang/test/CodeGen/PR76674.cpp b/clang/test/CodeGen/PR76674.cpp
new file mode 100644
index 0000000000000..2ce931920afe4
--- /dev/null
+++ b/clang/test/CodeGen/PR76674.cpp
@@ -0,0 +1,11 @@
+// RUN: %clang_cc1 -std=c++20 -emit-llvm -o - %s
+// expected-no-diagnostics
+
+template <class>
+struct A {
+ template <class U>
+ using Func = decltype([] {return U{};});
+};
+
+A<int>::Func<int> f{};
+int i{f()};
More information about the cfe-commits
mailing list