royjacobson updated this revision to Diff 464309. royjacobson added a comment.
Lock the test to standard version Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134885/new/ https://reviews.llvm.org/D134885 Files: clang/lib/Sema/SemaInit.cpp clang/test/SemaCXX/specialization-diagnose-crash.cpp Index: clang/test/SemaCXX/specialization-diagnose-crash.cpp =================================================================== --- /dev/null +++ clang/test/SemaCXX/specialization-diagnose-crash.cpp @@ -0,0 +1,24 @@ +// RUN: %clang_cc1 -fsyntax-only %s --std=c++17 -verify +// This is a reduction of GH57370 and GH58028, originally appearing +// in libstdc++'s variant code. + +struct V1 {}; +struct V2 : V1 { + int &a; +}; + +template <class T> using void_t = void; + +template <class T> struct X { T x; }; + +template <class T1, class T2, class = void> struct Variant { + Variant() = delete; // expected-note {{deleted here}} +}; + +template <class T1, class T2> +struct Variant<T1, T2, void_t<decltype(X<T2>{T1()})>> {}; + +void f() { + Variant<V1, V1>(); + Variant<V1, V2>(); // expected-error {{call to deleted constructor}} +} Index: clang/lib/Sema/SemaInit.cpp =================================================================== --- clang/lib/Sema/SemaInit.cpp +++ clang/lib/Sema/SemaInit.cpp @@ -695,10 +695,10 @@ // member of reference type uninitialized, the program is // ill-formed. SemaRef.Diag(Loc, diag::err_init_reference_member_uninitialized) - << Field->getType() - << ILE->getSyntacticForm()->getSourceRange(); - SemaRef.Diag(Field->getLocation(), - diag::note_uninit_reference_member); + << Field->getType() + << (ILE->isSyntacticForm() ? ILE : ILE->getSyntacticForm()) + ->getSourceRange(); + SemaRef.Diag(Field->getLocation(), diag::note_uninit_reference_member); } hadError = true; return;
Index: clang/test/SemaCXX/specialization-diagnose-crash.cpp =================================================================== --- /dev/null +++ clang/test/SemaCXX/specialization-diagnose-crash.cpp @@ -0,0 +1,24 @@ +// RUN: %clang_cc1 -fsyntax-only %s --std=c++17 -verify +// This is a reduction of GH57370 and GH58028, originally appearing +// in libstdc++'s variant code. + +struct V1 {}; +struct V2 : V1 { + int &a; +}; + +template <class T> using void_t = void; + +template <class T> struct X { T x; }; + +template <class T1, class T2, class = void> struct Variant { + Variant() = delete; // expected-note {{deleted here}} +}; + +template <class T1, class T2> +struct Variant<T1, T2, void_t<decltype(X<T2>{T1()})>> {}; + +void f() { + Variant<V1, V1>(); + Variant<V1, V2>(); // expected-error {{call to deleted constructor}} +} Index: clang/lib/Sema/SemaInit.cpp =================================================================== --- clang/lib/Sema/SemaInit.cpp +++ clang/lib/Sema/SemaInit.cpp @@ -695,10 +695,10 @@ // member of reference type uninitialized, the program is // ill-formed. SemaRef.Diag(Loc, diag::err_init_reference_member_uninitialized) - << Field->getType() - << ILE->getSyntacticForm()->getSourceRange(); - SemaRef.Diag(Field->getLocation(), - diag::note_uninit_reference_member); + << Field->getType() + << (ILE->isSyntacticForm() ? ILE : ILE->getSyntacticForm()) + ->getSourceRange(); + SemaRef.Diag(Field->getLocation(), diag::note_uninit_reference_member); } hadError = true; return;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits