commit 7098cbd601ad915aed22d4b5850da99359f25bf3
author Richard Smith <richard-llvm@metafoo.co.uk> Wed Dec 21 05:04:46 2011 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed Dec 21 05:04:46 2011 +0000
tree 6ec1a0099f3ae963cb6bfe16f90edb10c9a61668
parent 9bddf4324a067b630c0f1147f283de0930092f5a

constexpr: diagnostic improvements for invalid lvalue-to-rvalue conversions in
constant expressions.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147035 91177308-0d34-0410-b5e6-96231b3b80d8

test/SemaCXX/constexpr-printing.cpp

diff --git a/test/SemaCXX/constexpr-printing.cpp b/test/SemaCXX/constexpr-printing.cpp
index 726d177..e6cf209 100644
--- a/test/SemaCXX/constexpr-printing.cpp
+++ b/test/SemaCXX/constexpr-printing.cpp
@@ -9,10 +9,8 @@
   int n, m;
 };
 
-constexpr int extract(const S &s) { return s.n; } // expected-note {{subexpression}}
+constexpr int extract(const S &s) { return s.n; } // expected-note {{read of uninitialized object is not allowed in a constant expression}}
 
-// FIXME: once we produce notes for constexpr variable declarations, this should
-// produce a note indicating that S.n is used uninitialized.
 constexpr S s1; // expected-error {{constant expression}} expected-note {{in call to 'S()'}}
 constexpr S s2(10);
 
@@ -32,9 +30,9 @@
 
 constexpr int test_printing(int a, float b, _Complex int c, _Complex float d,
                             int *e, int &f, vector_int g, U h) {
-  return *e; // expected-note {{subexpression}}
+  return *e; // expected-note {{read of non-constexpr variable 'u2'}}
 }
-U u2(0);
+U u2(0); // expected-note {{here}}
 static_assert(test_printing(12, 39.762, 3 + 4i, 12.9 + 3.6i, &u2.arr[4], u2.another.arr[2], (vector_int){5, 1, 2, 3}, u1) == 0, ""); // \
 expected-error {{constant expression}} \
 expected-note {{in call to 'test_printing(12, 3.976200e+01, 3+4i, 1.290000e+01+3.600000e+00i, &u2.T::arr[4], u2.another.arr[2], {5, 1, 2, 3}, {{{}}, {{}}, &u1.T::arr[2]})'}}
@@ -47,7 +45,7 @@
   int arr[256];
 };
 constexpr V v;
-constexpr int get(const int *p) { return *p; } // expected-note {{subexpression}}
+constexpr int get(const int *p) { return *p; } // expected-note {{read of dereferenced one-past-the-end pointer}}
 constexpr int passLargeArray(V v) { return get(v.arr+256); } // expected-note {{in call to 'get(&v.arr[256])'}}
 static_assert(passLargeArray(v) == 0, ""); // expected-error {{constant expression}} expected-note {{in call to 'passLargeArray({{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ...}})'}}
 
@@ -58,7 +56,7 @@
 };
 constexpr Union myUnion = 76;
 
-constexpr int badness(Union u) { return u.a + u.b; } // expected-note {{subexpression}}
+constexpr int badness(Union u) { return u.a + u.b; } // expected-note {{read of member 'a' of union with active member 'b'}}
 static_assert(badness(myUnion), ""); // expected-error {{constant expression}} \
         expected-note {{in call to 'badness({.b = 76})'}}
 
@@ -66,9 +64,9 @@
   int n;
   void f();
 };
-MemPtrTest mpt;
+MemPtrTest mpt; // expected-note {{here}}
 constexpr int MemPtr(int (MemPtrTest::*a), void (MemPtrTest::*b)(), int &c) {
-  return c; // expected-note {{subexpression}}
+  return c; // expected-note {{read of non-constexpr variable 'mpt'}}
 }
 static_assert(MemPtr(&MemPtrTest::n, &MemPtrTest::f, mpt.*&MemPtrTest::n), ""); // expected-error {{constant expression}} \
 expected-note {{in call to 'MemPtr(&MemPtrTest::n, &MemPtrTest::f, mpt.n)'}}