[clang] Fix CTAD not work for C++ explicit type conversion (functional annotation). #75779
Conversation
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Haojian Wu (hokein) ChangesFixes #64347 Full diff: https://github.com/llvm/llvm-project/pull/75779.diff 4 Files Affected:
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index f5ae6bb8925202..0bb614c2237794 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -685,6 +685,8 @@ Bug Fixes in This Version
(`#62157 <https://github.com/llvm/llvm-project/issues/62157>`_) and
(`#64885 <https://github.com/llvm/llvm-project/issues/64885>`_) and
(`#65568 <https://github.com/llvm/llvm-project/issues/65568>`_)
+- Fix an issue where CTAD fails for explicit type conversion. Fixes
+ (#64347 <https://github.com/llvm/llvm-project/issues/64347>`_)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index be6a136ef37bc4..85e1d28b0e3fdd 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -12957,7 +12957,7 @@ QualType Sema::deduceVarTypeFromInitializer(VarDecl *VDecl,
// FIXME: Initialization should not be taking a mutable list of inits.
SmallVector<Expr*, 8> InitsCopy(DeduceInits.begin(), DeduceInits.end());
return DeduceTemplateSpecializationFromInitializer(TSI, Entity, Kind,
- InitsCopy, PL);
+ InitsCopy);
}
if (DirectInit) {
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 4028b2d642b212..7036a88df6b90e 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -10573,7 +10573,7 @@ static bool isOrIsDerivedFromSpecializationOf(CXXRecordDecl *RD,
QualType Sema::DeduceTemplateSpecializationFromInitializer(
TypeSourceInfo *TSInfo, const InitializedEntity &Entity,
- const InitializationKind &Kind, MultiExprArg Inits, ParenListExpr *PL) {
+ const InitializationKind &Kind, MultiExprArg Inits) {
auto *DeducedTST = dyn_cast<DeducedTemplateSpecializationType>(
TSInfo->getType()->getContainedDeducedType());
assert(DeducedTST && "not a deduced template specialization type");
@@ -10804,9 +10804,12 @@ QualType Sema::DeduceTemplateSpecializationFromInitializer(
if (getLangOpts().CPlusPlus20 && !HasAnyDeductionGuide) {
if (ListInit && ListInit->getNumInits()) {
SynthesizeAggrGuide(ListInit);
- } else if (PL && PL->getNumExprs()) {
- InitListExpr TempListInit(getASTContext(), PL->getLParenLoc(),
- PL->exprs(), PL->getRParenLoc());
+ } else if (Inits.size()) { // parenthesized expression-list
+ // Inits are expressions inside the parentheses. We don't have
+ // the parentheses source locaitons, use the begin/end of Inits as the
+ // best heuristic.
+ InitListExpr TempListInit(getASTContext(), Inits.front()->getBeginLoc(),
+ Inits, Inits.back()->getEndLoc());
SynthesizeAggrGuide(&TempListInit);
}
}
diff --git a/clang/test/SemaCXX/ctad.cpp b/clang/test/SemaCXX/ctad.cpp
new file mode 100644
index 00000000000000..10806f107b4ee9
--- /dev/null
+++ b/clang/test/SemaCXX/ctad.cpp
@@ -0,0 +1,19 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -Wno-unused-value -std=c++20 %s
+// expected-no-diagnostics
+
+namespace GH64347 {
+
+template<typename X, typename Y> struct A { X x; Y y;};
+void test() {
+ A(1, 2);
+ new A(1, 2);
+}
+
+template<A a>
+void f() { (void)a; }
+void k() {
+ // Test CTAD works for non-type template arguments.
+ f<A(0, 0)>();
+}
+
+} // namespace GH64347
|
clang/lib/Sema/SemaInit.cpp
Outdated
| PL->exprs(), PL->getRParenLoc()); | ||
| } else if (Inits.size()) { // parenthesized expression-list | ||
| // Inits are expressions inside the parentheses. We don't have | ||
| // the parentheses source locaitons, use the begin/end of Inits as the |
There was a problem hiding this comment.
| // the parentheses source locaitons, use the begin/end of Inits as the | |
| // the parentheses source locations, use the begin/end of Inits as the |
We could keep Looking at all usages (total 4) of |
|
Can you please update your summary to explain the problem and how the fix addresses the problem. This is usually what goes into the git log and we want those to be as descriptive as possible but also it help code reviewers to understand what they are reviewing quicker. |
As long as it does not effect the quality of the diagnostics then this makes sense. |
Thanks, I have updated the description with more details. |
hokein
force-pushed
the
ctad-explicit-type
branch
from
073f3d8 to
163a43a
Compare
If it has to appear in the git log, it has to be added to the commit message. |
GitHub's "squash and merge" button already does this for us. |
This fixes #64347.
The CTAD for an aggregate class is missing to handle the explicit type conversion case, e.g.
TemplateFooClass(1, 2);. Per C++ expr.type.conv p1, the deduced type is the return type of the deduction guide selected by the CTAD for the reminder.In the deduction implementation
DeduceTemplateSpecializationFromInitializer, the parenthesized express-list case relies on theParenListExprparameter (default is nullptr), the ASTParenListExprnode is not built for all variant initializer cases (BuildCXXTypeConstructorExpr,BuildCXXNewetc), thus the deduction doesn't perform for these cases. This patch fixes it by removing theParenListExprand using theInitsinstead (which also simplifies the interface and implementation).