[clang] [libcxx] [clang][Sema] Add checks for validity of default ctor's class (PR #78898)

[Vlad Serebrennikov via cfe-commits]

https://github.com/Endilll closed 
https://github.com/llvm/llvm-project/pull/78898
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [libcxx] [clang][Sema] Add checks for validity of default ctor's class (PR #78898)

[Nikolas Klauser via cfe-commits]

https://github.com/philnik777 approved this pull request.

The libc++ changes LGTM.

https://github.com/llvm/llvm-project/pull/78898
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [libcxx] [clang][Sema] Add checks for validity of default ctor's class (PR #78898)

[Vlad Serebrennikov via cfe-commits]

https://github.com/Endilll updated 
https://github.com/llvm/llvm-project/pull/78898

>From b99a75a8756a7841657fc78ffbd40f780a412f2b Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov 
Date: Sun, 21 Jan 2024 16:26:29 +0300
Subject: [PATCH 1/3] [clang][Sema] Add checks for validity of default ctor's
 class

Fixes #10518
Fixes #67914
Fixes #78388
Also addresses the second example in #49103

This patch is based on suggestion from @cor3ntin in 
https://github.com/llvm/llvm-project/issues/67914#issuecomment-1896011898
---
 clang/docs/ReleaseNotes.rst| 5 +
 clang/lib/Sema/SemaDeclCXX.cpp | 7 +++
 2 files changed, 12 insertions(+)

diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 8bb26fcae18d6b..5971bda21a5e25 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -1013,6 +1013,11 @@ Bug Fixes to C++ Support
 - Fix a false-positive ODR violation for different definitions for 
`std::align_val_t`.
   Fixes (`#76638 `_)
 
+- Fix crash when calling the constructor of an invalid class.
+  Fixes (`#10518 `_),
+  (`#67914 `_),
+  and (`#78388 `_)
+
 - Remove recorded `#pragma once` state for headers included in named modules.
   Fixes (`#77995 `_)
 
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index df5bd55e7c2836..634af573480b45 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -5990,6 +5990,10 @@ void Sema::ActOnDefaultCtorInitializers(Decl *CDtorDecl) 
{
 
   if (CXXConstructorDecl *Constructor
   = dyn_cast(CDtorDecl)) {
+if (CXXRecordDecl *ClassDecl = Constructor->getParent();
+!ClassDecl || ClassDecl->isInvalidDecl()) {
+  return;
+}
 SetCtorInitializers(Constructor, /*AnyErrors=*/false);
 DiagnoseUninitializedFields(*this, Constructor);
   }
@@ -14030,6 +14034,9 @@ void 
Sema::DefineImplicitDefaultConstructor(SourceLocation CurrentLocation,
 
   CXXRecordDecl *ClassDecl = Constructor->getParent();
   assert(ClassDecl && "DefineImplicitDefaultConstructor - invalid 
constructor");
+  if (ClassDecl->isInvalidDecl()) {
+return;
+  }
 
   SynthesizedFunctionScope Scope(*this, Constructor);
 

>From 826dc7aa7cad2c2d2eaa02b30c814e63abf222b6 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov 
Date: Fri, 26 Jan 2024 08:50:52 +0300
Subject: [PATCH 2/3] Add regression tests for fixed crashes

---
 clang/test/SemaCXX/crash-GH10518.cpp   | 22 
 clang/test/SemaCXX/crash-GH49103-2.cpp | 13 +
 clang/test/SemaCXX/crash-GH67914.cpp   | 78 ++
 clang/test/SemaCXX/crash-GH78388.cpp   | 17 ++
 4 files changed, 130 insertions(+)
 create mode 100644 clang/test/SemaCXX/crash-GH10518.cpp
 create mode 100644 clang/test/SemaCXX/crash-GH49103-2.cpp
 create mode 100644 clang/test/SemaCXX/crash-GH67914.cpp
 create mode 100644 clang/test/SemaCXX/crash-GH78388.cpp

diff --git a/clang/test/SemaCXX/crash-GH10518.cpp 
b/clang/test/SemaCXX/crash-GH10518.cpp
new file mode 100644
index 00..6c5f80afd3cf8b
--- /dev/null
+++ b/clang/test/SemaCXX/crash-GH10518.cpp
@@ -0,0 +1,22 @@
+// RUN: %clang_cc1 -verify -std=c++98 %s
+// RUN: %clang_cc1 -verify -std=c++11 %s
+// RUN: %clang_cc1 -verify -std=c++14 %s
+// RUN: %clang_cc1 -verify -std=c++17 %s
+// RUN: %clang_cc1 -verify -std=c++20 %s
+// RUN: %clang_cc1 -verify -std=c++23 %s
+// RUN: %clang_cc1 -verify -std=c++2c %s
+
+// https://github.com/llvm/llvm-project/issues/10518
+
+template 
+class A : public T {
+};
+
+template 
+class B : public A {
+};
+
+template 
+class B : public A { // expected-error 0-1 {{}}
+   B(T *t) {}
+};
diff --git a/clang/test/SemaCXX/crash-GH49103-2.cpp 
b/clang/test/SemaCXX/crash-GH49103-2.cpp
new file mode 100644
index 00..4c17a054c73afc
--- /dev/null
+++ b/clang/test/SemaCXX/crash-GH49103-2.cpp
@@ -0,0 +1,13 @@
+// RUN: %clang_cc1 -verify -std=c++98 %s
+// RUN: %clang_cc1 -verify -std=c++11 %s
+// RUN: %clang_cc1 -verify -std=c++14 %s
+// RUN: %clang_cc1 -verify -std=c++17 %s
+// RUN: %clang_cc1 -verify -std=c++20 %s
+// RUN: %clang_cc1 -verify -std=c++23 %s
+// RUN: %clang_cc1 -verify -std=c++2c %s
+
+// https://github.com/llvm/llvm-project/issues/49103
+
+template struct A; // expected-note 0+ {{}}
+struct S : __make_integer_seq { }; // expected-error 0+ {{}}
+S s;
diff --git a/clang/test/SemaCXX/crash-GH67914.cpp 
b/clang/test/SemaCXX/crash-GH67914.cpp
new file mode 100644
index 00..fbaeac636c0db1
--- /dev/null
+++ b/clang/test/SemaCXX/crash-GH67914.cpp
@@ -0,0 +1,78 @@
+// RUN: %clang_cc1 -verify -std=c++98 %s
+// RUN: %clang_cc1 -verify -std=c++11 %s
+// RUN: %clang_cc1 -verify -std=c++14 %s
+// RUN: %clang_cc1 -verify -std=c++17 %s
+// RUN: %clang_cc1 -verify -std=c++20 %s
+// RUN