diff options
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 7 | ||||
| -rw-r--r-- | clang/test/SemaCXX/libstdcxx_explicit_init_list_hack.cpp | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index adec512693f..1b958ae782c 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -443,8 +443,11 @@ ExprResult InitListChecker::PerformEmptyInit(Sema &SemaRef, if (!VerifyOnly) { SemaRef.Diag(CtorDecl->getLocation(), diag::warn_invalid_initializer_from_system_header); - SemaRef.Diag(Entity.getDecl()->getLocation(), - diag::note_used_in_initialization_here); + if (Entity.getKind() == InitializedEntity::EK_Member) + SemaRef.Diag(Entity.getDecl()->getLocation(), + diag::note_used_in_initialization_here); + else if (Entity.getKind() == InitializedEntity::EK_ArrayElement) + SemaRef.Diag(Loc, diag::note_used_in_initialization_here); } } } diff --git a/clang/test/SemaCXX/libstdcxx_explicit_init_list_hack.cpp b/clang/test/SemaCXX/libstdcxx_explicit_init_list_hack.cpp index 774745777c1..f9e0a5c0a1f 100644 --- a/clang/test/SemaCXX/libstdcxx_explicit_init_list_hack.cpp +++ b/clang/test/SemaCXX/libstdcxx_explicit_init_list_hack.cpp @@ -9,7 +9,7 @@ namespace __debug { template <class T> class vector { public: - explicit vector() {} // expected-warning{{should not be explicit}} + explicit vector() {} // expected-warning 2 {{should not be explicit}} }; } } @@ -19,5 +19,6 @@ public: #include __FILE__ struct { int a, b; std::__debug::vector<int> c; } e[] = { {1, 1} }; // expected-note{{used in initialization here}} - +// expected-warning@+1 {{expression with side effects has no effect in an unevaluated context}} +decltype(new std::__debug::vector<int>[1]{}) x; // expected-note{{used in initialization here}} #endif |
