adamcz updated this revision to Diff 329346.
adamcz added a comment.
expanded a comment
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D97965/new/
https://reviews.llvm.org/D97965
Files:
clang/lib/Sema/SemaTemplate.cpp
clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
Index: clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
===================================================================
--- clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
+++ clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
@@ -416,6 +416,17 @@
}
+namespace no_crash_on_default_arg {
+class A {
+ template <typename T> class B {
+ B(int c = 1);
+ };
+ // This used to crash due to unparsed default arg above. The diagnostic could
+ // be improved, but the point of this test is to simply check we do not
crash.
+ B(); // expected-error {{deduction guide declaration without trailing return
type}}
+};
+} // namespace no_crash_on_default_arg
+
#pragma clang diagnostic push
#pragma clang diagnostic warning "-Wctad-maybe-unsupported"
namespace test_implicit_ctad_warning {
Index: clang/lib/Sema/SemaTemplate.cpp
===================================================================
--- clang/lib/Sema/SemaTemplate.cpp
+++ clang/lib/Sema/SemaTemplate.cpp
@@ -2494,6 +2494,12 @@
if (!CD || (!FTD && CD->isFunctionTemplateSpecialization()))
continue;
+ // Cannot make a deduction guide when unparsed arguments are present.
+ if (std::any_of(CD->param_begin(), CD->param_end(), [](ParmVarDecl *P) {
+ return !P || P->hasUnparsedDefaultArg();
+ }))
+ continue;
+
Transform.transformConstructor(FTD, CD);
AddedAny = true;
}
Index: clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
===================================================================
--- clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
+++ clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp
@@ -416,6 +416,17 @@
}
+namespace no_crash_on_default_arg {
+class A {
+ template <typename T> class B {
+ B(int c = 1);
+ };
+ // This used to crash due to unparsed default arg above. The diagnostic could
+ // be improved, but the point of this test is to simply check we do not crash.
+ B(); // expected-error {{deduction guide declaration without trailing return type}}
+};
+} // namespace no_crash_on_default_arg
+
#pragma clang diagnostic push
#pragma clang diagnostic warning "-Wctad-maybe-unsupported"
namespace test_implicit_ctad_warning {
Index: clang/lib/Sema/SemaTemplate.cpp
===================================================================
--- clang/lib/Sema/SemaTemplate.cpp
+++ clang/lib/Sema/SemaTemplate.cpp
@@ -2494,6 +2494,12 @@
if (!CD || (!FTD && CD->isFunctionTemplateSpecialization()))
continue;
+ // Cannot make a deduction guide when unparsed arguments are present.
+ if (std::any_of(CD->param_begin(), CD->param_end(), [](ParmVarDecl *P) {
+ return !P || P->hasUnparsedDefaultArg();
+ }))
+ continue;
+
Transform.transformConstructor(FTD, CD);
AddedAny = true;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
