[clang][Interp] Don't assume throw stmts have a subexpr

Differential Revision: https://reviews.llvm.org/D156503
llvm · Jul 28, 2023 · 7010a4f · 7010a4f
1 parent 81fb216
commit 7010a4f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/clang/lib/AST/Interp/ByteCodeExprGen.cpp b/clang/lib/AST/Interp/ByteCodeExprGen.cpp
@@ -1000,7 +1000,7 @@ bool ByteCodeExprGen<Emitter>::VisitPredefinedExpr(const PredefinedExpr *E) {
 
 template <class Emitter>
 bool ByteCodeExprGen<Emitter>::VisitCXXThrowExpr(const CXXThrowExpr *E) {
-  if (!this->discard(E->getSubExpr()))
+  if (E->getSubExpr() && !this->discard(E->getSubExpr()))
     return false;
 
   return this->emitInvalid(E);

diff --git a/clang/test/AST/Interp/invalid.cpp b/clang/test/AST/Interp/invalid.cpp
@@ -23,6 +23,17 @@ namespace Throw {
              // ref-note {{subexpression not valid in a constant expression}}
     return 0;
   }
+
+  constexpr int NoSubExpr() { // ref-error {{never produces a constant expression}} \
+                              // expected-error {{never produces a constant expression}}
+    throw; // ref-note 2{{subexpression not valid}} \
+           // expected-note 2{{subexpression not valid}}
+    return 0;
+  }
+  static_assert(NoSubExpr() == 0, ""); // ref-error {{not an integral constant expression}} \
+                                       // ref-note {{in call to}} \
+                                       // expected-error {{not an integral constant expression}} \
+                                       // expected-note {{in call to}}
 }
 
 namespace Asm {