[PATCH] D68716: [clang] prevent crash for nonnull attribut in constant context (Bug 43601)

[Tyker via Phabricator via cfe-commits]

Tyker created this revision.
Tyker added a reviewer: rnk.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

bug : https://bugs.llvm.org/show_bug.cgi?id=43601


Repository:
  rC Clang

https://reviews.llvm.org/D68716

Files:
  clang/lib/AST/ExprConstant.cpp
  clang/test/SemaCXX/attr-nonnull.cpp


Index: clang/test/SemaCXX/attr-nonnull.cpp
===================================================================
--- clang/test/SemaCXX/attr-nonnull.cpp
+++ clang/test/SemaCXX/attr-nonnull.cpp
@@ -77,10 +77,11 @@
 constexpr int i32 = f3(0, &c);
 
 __attribute__((nonnull(4))) __attribute__((nonnull)) //expected-error {{out of bounds}}
-constexpr int f4(const int*, const int*) {
+constexpr int f4(const int*, const int*, int) {
   return 0;
 }
-constexpr int i4 = f4(&c, 0); //expected-error {{constant expression}} expected-note {{null passed}}
-constexpr int i42 = f4(0, &c); //expected-error {{constant expression}} expected-note {{null passed}}
+constexpr int i4 = f4(&c, 0, 0); //expected-error {{constant expression}} expected-note {{null passed}}
+constexpr int i42 = f4(0, &c, 1); //expected-error {{constant expression}} expected-note {{null passed}}
+constexpr int i43 = f4(&c, &c, 0);
 
 }
\ No newline at end of file
Index: clang/lib/AST/ExprConstant.cpp
===================================================================
--- clang/lib/AST/ExprConstant.cpp
+++ clang/lib/AST/ExprConstant.cpp
@@ -5451,6 +5451,7 @@
       Success = false;
     } else if (!ForbiddenNullArgs.empty() &&
                ForbiddenNullArgs[I - Args.begin()] &&
+               ArgValues[I - Args.begin()].isLValue() &&
                ArgValues[I - Args.begin()].isNullPointer()) {
       Info.CCEDiag(*I, diag::note_non_null_attribute_failed);
       if (!Info.noteFailure())


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68716.224101.patch
Type: text/x-patch
Size: 1467 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191009/806f40da/attachment.bin>