diff options
author | Roy Jacobson <roi.jacobson1@gmail.com> | 2022-09-30 11:24:46 +0300 |
---|---|---|
committer | Roy Jacobson <roi.jacobson1@gmail.com> | 2022-09-30 11:24:46 +0300 |
commit | 894c0e94f9c62413feef88fd577c430839abaea7 (patch) | |
tree | 599d9487ca92b9714dd383df8a3d4601b5849c95 | |
parent | bd1bb8cd42548d5e50e84f52a5098eec1ee92c98 (diff) | |
download | llvm-project-894c0e94f9c62413feef88fd577c430839abaea7.tar.gz |
Revert "[Clang] Fix variant crashes from GH58028, GH57370"
This reverts commit 9706bb3165f5e508d5e2247ad8a3f45077df546d, some CI workers complain about the test.
-rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 8 | ||||
-rw-r--r-- | clang/test/SemaCXX/specialization-diagnose-crash.cpp | 24 |
2 files changed, 4 insertions, 28 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index ee6fee0ac732..7097b9deb8ed 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -695,10 +695,10 @@ void InitListChecker::FillInEmptyInitForField(unsigned Init, FieldDecl *Field, // member of reference type uninitialized, the program is // ill-formed. SemaRef.Diag(Loc, diag::err_init_reference_member_uninitialized) - << Field->getType() - << (ILE->isSyntacticForm() ? ILE : ILE->getSyntacticForm()) - ->getSourceRange(); - SemaRef.Diag(Field->getLocation(), diag::note_uninit_reference_member); + << Field->getType() + << ILE->getSyntacticForm()->getSourceRange(); + SemaRef.Diag(Field->getLocation(), + diag::note_uninit_reference_member); } hadError = true; return; diff --git a/clang/test/SemaCXX/specialization-diagnose-crash.cpp b/clang/test/SemaCXX/specialization-diagnose-crash.cpp deleted file mode 100644 index ceb3c4655f74..000000000000 --- a/clang/test/SemaCXX/specialization-diagnose-crash.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// RUN: %clang_cc1 -fsyntax-only %s -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}} -} |