File tree Expand file tree Collapse file tree 3 files changed +18
-7
lines changed Expand file tree Collapse file tree 3 files changed +18
-7
lines changed Original file line number Diff line number Diff line change @@ -2674,7 +2674,7 @@ void ASTDeclReader::VisitTemplateTypeParmDecl(TemplateTypeParmDecl *D) {
26742674
26752675 D->setDeclaredWithTypename (Record.readInt ());
26762676
2677- if (D->hasTypeConstraint ()) {
2677+ if (Record. readBool () && D->hasTypeConstraint ()) {
26782678 ConceptReference *CR = nullptr ;
26792679 if (Record.readBool ())
26802680 CR = Record.readConceptReference ();
Original file line number Diff line number Diff line change @@ -1899,7 +1899,7 @@ void ASTDeclWriter::VisitTemplateTypeParmDecl(TemplateTypeParmDecl *D) {
18991899 Record.push_back (D->wasDeclaredWithTypename ());
19001900
19011901 const TypeConstraint *TC = D->getTypeConstraint ();
1902- assert (( bool ) TC == D-> hasTypeConstraint () );
1902+ Record. push_back ( /* TypeConstraintInitialized= */ TC != nullptr );
19031903 if (TC) {
19041904 auto *CR = TC->getConceptReference ();
19051905 Record.push_back (CR != nullptr );
@@ -1917,7 +1917,7 @@ void ASTDeclWriter::VisitTemplateTypeParmDecl(TemplateTypeParmDecl *D) {
19171917 if (OwnsDefaultArg)
19181918 Record.AddTemplateArgumentLoc (D->getDefaultArgument ());
19191919
1920- if (!TC && !OwnsDefaultArg &&
1920+ if (!D-> hasTypeConstraint () && !OwnsDefaultArg &&
19211921 D->getDeclContext () == D->getLexicalDeclContext () &&
19221922 !D->isInvalidDecl () && !D->hasAttrs () &&
19231923 !D->isTopLevelDeclInObjCContainer () && !D->isImplicit () &&
@@ -2580,6 +2580,7 @@ void ASTWriter::WriteDeclAbbrevs() {
25802580 // TemplateTypeParmDecl
25812581 Abv->Add (
25822582 BitCodeAbbrevOp (BitCodeAbbrevOp::Fixed, 1 )); // wasDeclaredWithTypename
2583+ Abv->Add (BitCodeAbbrevOp (0 )); // TypeConstraintInitialized
25832584 Abv->Add (BitCodeAbbrevOp (0 )); // OwnsDefaultArg
25842585 DeclTemplateTypeParmAbbrev = Stream.EmitAbbrev (std::move (Abv));
25852586
Original file line number Diff line number Diff line change 1- // RUN: %clang_cc1 -std=c++2a -emit-pch %s -o %t
2- // RUN: %clang_cc1 -std=c++2a -include-pch %t -verify %s
3-
4- // expected-no-diagnostics
1+ // RUN: %clang_cc1 -std=c++2a -fallow-pch-with-compiler-errors -emit-pch %s -o %t -verify
2+ // RUN: %clang_cc1 -std=c++2a -fallow-pch-with-compiler-errors -include-pch %t %s -verify
53
64#ifndef HEADER
75#define HEADER
@@ -27,3 +25,15 @@ int main() {
2725}
2826
2927#endif
28+
29+ namespace GH99036 {
30+
31+ template <typename T>
32+ concept C;
33+ // expected-error@-1 {{expected '='}} \
34+ // expected-note@-1 {{declared here}}
35+
36+ template <C U> void f ();
37+ // expected-error@-1 {{a concept definition cannot refer to itself}}
38+
39+ } // namespace GH99036
You can’t perform that action at this time.
0 commit comments