diff options
author | Tom Stellard <tstellar@redhat.com> | 2018-04-07 03:30:07 +0000 |
---|---|---|
committer | Tom Stellard <tstellar@redhat.com> | 2018-04-07 03:30:07 +0000 |
commit | d5f48a217f404c3462537527f4169bb45eed3904 (patch) | |
tree | 6987563cb1aae0c02ba865a5646d268320784aff | |
parent | ff0c0d8ab3e316bb6e2741fedb3b545e198eab7a (diff) |
Merging r327099:
------------------------------------------------------------------------
r327099 | rsmith | 2018-03-08 18:00:01 -0800 (Thu, 08 Mar 2018) | 3 lines
PR36645: Go looking for an appropriate array bound when constant-evaluating a
name of an array object.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_60@329478 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/AST/ExprConstant.cpp | 16 | ||||
-rw-r--r-- | test/SemaCXX/constant-expression-cxx11.cpp | 4 |
2 files changed, 16 insertions, 4 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 8d9b3c3beb..5c9744f4e8 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -61,14 +61,22 @@ namespace { static QualType getType(APValue::LValueBase B) { if (!B) return QualType(); - if (const ValueDecl *D = B.dyn_cast<const ValueDecl*>()) + if (const ValueDecl *D = B.dyn_cast<const ValueDecl*>()) { // FIXME: It's unclear where we're supposed to take the type from, and - // this actually matters for arrays of unknown bound. Using the type of - // the most recent declaration isn't clearly correct in general. Eg: + // this actually matters for arrays of unknown bound. Eg: // // extern int arr[]; void f() { extern int arr[3]; }; // constexpr int *p = &arr[1]; // valid? - return cast<ValueDecl>(D->getMostRecentDecl())->getType(); + // + // For now, we take the array bound from the most recent declaration. + for (auto *Redecl = cast<ValueDecl>(D->getMostRecentDecl()); Redecl; + Redecl = cast_or_null<ValueDecl>(Redecl->getPreviousDecl())) { + QualType T = Redecl->getType(); + if (!T->isIncompleteArrayType()) + return T; + } + return D->getType(); + } const Expr *Base = B.get<const Expr*>(); diff --git a/test/SemaCXX/constant-expression-cxx11.cpp b/test/SemaCXX/constant-expression-cxx11.cpp index 51dd6199e6..fe4c54e7e6 100644 --- a/test/SemaCXX/constant-expression-cxx11.cpp +++ b/test/SemaCXX/constant-expression-cxx11.cpp @@ -629,6 +629,10 @@ namespace ArrayOfUnknownBound { extern const int carr[]; // expected-note {{here}} constexpr int n = carr[0]; // expected-error {{constant}} expected-note {{non-constexpr variable}} + + constexpr int local_extern[] = {1, 2, 3}; + void f() { extern const int local_extern[]; } + static_assert(local_extern[1] == 2, ""); } namespace DependentValues { |