[PATCH] D150948: [clang][RecoveryExpr] Fix a crash where a dependent type crahes on c-only code path.

2023-05-19 Thread Haojian Wu via Phabricator via cfe-commits 
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGa62e205254c0: [clang][RecoveryExpr] Fix a crash where a 
dependent type crahes on c-only code… (authored by hokein).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D150948/new/

https://reviews.llvm.org/D150948

Files:
  clang/docs/ReleaseNotes.rst
  clang/lib/Sema/SemaDecl.cpp
  clang/test/AST/ast-dump-recovery.c


Index: clang/test/AST/ast-dump-recovery.c
===
--- clang/test/AST/ast-dump-recovery.c
+++ clang/test/AST/ast-dump-recovery.c
@@ -98,3 +98,14 @@
   // CHECK-NEXT: `-RecoveryExpr {{.*}} ''
   ext(undef_var);
 }
+
+// Verify no crash.
+void test4() {
+  enum GH62446 {
+// CHECK:  RecoveryExpr {{.*}} '' contains-errors 
lvalue
+// CHECK-NEXT: |-StringLiteral {{.*}} "a"
+// CHECK-NEXT: `-IntegerLiteral {{.*}} 2
+invalid_enum_value = "a" * 2,
+b,
+  };
+}
Index: clang/lib/Sema/SemaDecl.cpp
===
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -19307,6 +19307,7 @@
 if (!getLangOpts().CPlusPlus && !T.isNull())
   Diag(IdLoc, diag::warn_enum_value_overflow);
   } else if (!getLangOpts().CPlusPlus &&
+ !EltTy->isDependentType() &&
  !isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
 // Enforce C99 6.7.2.2p2 even when we compute the next value.
 Diag(IdLoc, diag::ext_enum_value_not_int)
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -410,6 +410,9 @@
   when it had been instantiated from a partial template specialization with 
different
   template arguments on the containing class. This fixes:
   (`#60778 `_).
+- Fix a crash when an enum constant has a dependent-type recovery expression 
for
+  C.
+  (`#62446 `_).
 
 Bug Fixes to Compiler Builtins
 ^^


Index: clang/test/AST/ast-dump-recovery.c
===
--- clang/test/AST/ast-dump-recovery.c
+++ clang/test/AST/ast-dump-recovery.c
@@ -98,3 +98,14 @@
   // CHECK-NEXT: `-RecoveryExpr {{.*}} ''
   ext(undef_var);
 }
+
+// Verify no crash.
+void test4() {
+  enum GH62446 {
+// CHECK:  RecoveryExpr {{.*}} '' contains-errors lvalue
+// CHECK-NEXT: |-StringLiteral {{.*}} "a"
+// CHECK-NEXT: `-IntegerLiteral {{.*}} 2
+invalid_enum_value = "a" * 2,
+b,
+  };
+}
Index: clang/lib/Sema/SemaDecl.cpp
===
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -19307,6 +19307,7 @@
 if (!getLangOpts().CPlusPlus && !T.isNull())
   Diag(IdLoc, diag::warn_enum_value_overflow);
   } else if (!getLangOpts().CPlusPlus &&
+ !EltTy->isDependentType() &&
  !isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
 // Enforce C99 6.7.2.2p2 even when we compute the next value.
 Diag(IdLoc, diag::ext_enum_value_not_int)
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -410,6 +410,9 @@
   when it had been instantiated from a partial template specialization with different
   template arguments on the containing class. This fixes:
   (`#60778 `_).
+- Fix a crash when an enum constant has a dependent-type recovery expression for
+  C.
+  (`#62446 `_).
 
 Bug Fixes to Compiler Builtins
 ^^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D150948: [clang][RecoveryExpr] Fix a crash where a dependent type crahes on c-only code path.

2023-05-19 Thread Haojian Wu via Phabricator via cfe-commits 
hokein added a comment.

Thanks for the fast review!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D150948/new/

https://reviews.llvm.org/D150948

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D150948: [clang][RecoveryExpr] Fix a crash where a dependent type crahes on c-only code path.

2023-05-19 Thread Haojian Wu via Phabricator via cfe-commits 
hokein updated this revision to Diff 523868.
hokein added a comment.

add release note.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D150948/new/

https://reviews.llvm.org/D150948

Files:
  clang/docs/ReleaseNotes.rst
  clang/lib/Sema/SemaDecl.cpp
  clang/test/AST/ast-dump-recovery.c


Index: clang/test/AST/ast-dump-recovery.c
===
--- clang/test/AST/ast-dump-recovery.c
+++ clang/test/AST/ast-dump-recovery.c
@@ -98,3 +98,14 @@
   // CHECK-NEXT: `-RecoveryExpr {{.*}} ''
   ext(undef_var);
 }
+
+// Verify no crash.
+void test4() {
+  enum GH62446 {
+// CHECK:  RecoveryExpr {{.*}} '' contains-errors 
lvalue
+// CHECK-NEXT: |-StringLiteral {{.*}} "a"
+// CHECK-NEXT: `-IntegerLiteral {{.*}} 2
+invalid_enum_value = "a" * 2,
+b,
+  };
+}
Index: clang/lib/Sema/SemaDecl.cpp
===
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -19307,6 +19307,7 @@
 if (!getLangOpts().CPlusPlus && !T.isNull())
   Diag(IdLoc, diag::warn_enum_value_overflow);
   } else if (!getLangOpts().CPlusPlus &&
+ !EltTy->isDependentType() &&
  !isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
 // Enforce C99 6.7.2.2p2 even when we compute the next value.
 Diag(IdLoc, diag::ext_enum_value_not_int)
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -406,6 +406,9 @@
   when it had been instantiated from a partial template specialization with 
different
   template arguments on the containing class. This fixes:
   (`#60778 `_).
+- Fix a crash when an enum constant has a dependent-type recovery expression 
for
+  C.
+  (`#62446 `_).
 
 Bug Fixes to Compiler Builtins
 ^^


Index: clang/test/AST/ast-dump-recovery.c
===
--- clang/test/AST/ast-dump-recovery.c
+++ clang/test/AST/ast-dump-recovery.c
@@ -98,3 +98,14 @@
   // CHECK-NEXT: `-RecoveryExpr {{.*}} ''
   ext(undef_var);
 }
+
+// Verify no crash.
+void test4() {
+  enum GH62446 {
+// CHECK:  RecoveryExpr {{.*}} '' contains-errors lvalue
+// CHECK-NEXT: |-StringLiteral {{.*}} "a"
+// CHECK-NEXT: `-IntegerLiteral {{.*}} 2
+invalid_enum_value = "a" * 2,
+b,
+  };
+}
Index: clang/lib/Sema/SemaDecl.cpp
===
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -19307,6 +19307,7 @@
 if (!getLangOpts().CPlusPlus && !T.isNull())
   Diag(IdLoc, diag::warn_enum_value_overflow);
   } else if (!getLangOpts().CPlusPlus &&
+ !EltTy->isDependentType() &&
  !isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
 // Enforce C99 6.7.2.2p2 even when we compute the next value.
 Diag(IdLoc, diag::ext_enum_value_not_int)
Index: clang/docs/ReleaseNotes.rst
===
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -406,6 +406,9 @@
   when it had been instantiated from a partial template specialization with different
   template arguments on the containing class. This fixes:
   (`#60778 `_).
+- Fix a crash when an enum constant has a dependent-type recovery expression for
+  C.
+  (`#62446 `_).
 
 Bug Fixes to Compiler Builtins
 ^^
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D150948: [clang][RecoveryExpr] Fix a crash where a dependent type crahes on c-only code path.

2023-05-19 Thread Shafik Yaghmour via Phabricator via cfe-commits 
shafik accepted this revision.
shafik added a comment.

Thank you for the fix, LGTM


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D150948/new/

https://reviews.llvm.org/D150948

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D150948: [clang][RecoveryExpr] Fix a crash where a dependent type crahes on c-only code path.

2023-05-19 Thread Aaron Ballman via Phabricator via cfe-commits 
aaron.ballman accepted this revision.
aaron.ballman added a comment.
This revision is now accepted and ready to land.

LGTM, but this should have a release note for the fix. Thanks!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D150948/new/

https://reviews.llvm.org/D150948

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D150948: [clang][RecoveryExpr] Fix a crash where a dependent type crahes on c-only code path.

2023-05-19 Thread Haojian Wu via Phabricator via cfe-commits 
hokein created this revision.
hokein added a reviewer: sammccall.
Herald added a project: All.
hokein requested review of this revision.
Herald added a project: clang.

A depenent type is possible in C-only path, add a proper handling when
checking the enum constant.

Fixes https://github.com/llvm/llvm-project/issues/62446


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D150948

Files:
  clang/lib/Sema/SemaDecl.cpp
  clang/test/AST/ast-dump-recovery.c


Index: clang/test/AST/ast-dump-recovery.c
===
--- clang/test/AST/ast-dump-recovery.c
+++ clang/test/AST/ast-dump-recovery.c
@@ -98,3 +98,14 @@
   // CHECK-NEXT: `-RecoveryExpr {{.*}} ''
   ext(undef_var);
 }
+
+// Verify no crash.
+void test4() {
+  enum GH62446 {
+// CHECK:  RecoveryExpr {{.*}} '' contains-errors 
lvalue
+// CHECK-NEXT: |-StringLiteral {{.*}} "a"
+// CHECK-NEXT: `-IntegerLiteral {{.*}} 2
+invalid_enum_value = "a" * 2,
+b,
+  };
+}
Index: clang/lib/Sema/SemaDecl.cpp
===
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -19307,6 +19307,7 @@
 if (!getLangOpts().CPlusPlus && !T.isNull())
   Diag(IdLoc, diag::warn_enum_value_overflow);
   } else if (!getLangOpts().CPlusPlus &&
+ !EltTy->isDependentType() &&
  !isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
 // Enforce C99 6.7.2.2p2 even when we compute the next value.
 Diag(IdLoc, diag::ext_enum_value_not_int)


Index: clang/test/AST/ast-dump-recovery.c
===
--- clang/test/AST/ast-dump-recovery.c
+++ clang/test/AST/ast-dump-recovery.c
@@ -98,3 +98,14 @@
   // CHECK-NEXT: `-RecoveryExpr {{.*}} ''
   ext(undef_var);
 }
+
+// Verify no crash.
+void test4() {
+  enum GH62446 {
+// CHECK:  RecoveryExpr {{.*}} '' contains-errors lvalue
+// CHECK-NEXT: |-StringLiteral {{.*}} "a"
+// CHECK-NEXT: `-IntegerLiteral {{.*}} 2
+invalid_enum_value = "a" * 2,
+b,
+  };
+}
Index: clang/lib/Sema/SemaDecl.cpp
===
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -19307,6 +19307,7 @@
 if (!getLangOpts().CPlusPlus && !T.isNull())
   Diag(IdLoc, diag::warn_enum_value_overflow);
   } else if (!getLangOpts().CPlusPlus &&
+ !EltTy->isDependentType() &&
  !isRepresentableIntegerValue(Context, EnumVal, EltTy)) {
 // Enforce C99 6.7.2.2p2 even when we compute the next value.
 Diag(IdLoc, diag::ext_enum_value_not_int)
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits