obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 20 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
new file mode 100644
index 000000000..183d3f768
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag1.C
@@ -0,0 +1,20 @@
+// Test that we explain why a template instantiation isn't constexpr
+// { dg-options -std=c++0x }
+
+template <class T>
+struct A
+{
+  T t;
+  constexpr int f() { return 42; } // { dg-error "enclosing class" }
+};
+
+struct B { B(); operator int(); };
+
+constexpr A<int> ai = { 42 };
+constexpr int i = ai.f();
+
+constexpr int b = A<B>().f();	// { dg-error "not a constexpr function" }
+
+template <class T>
+constexpr int f (T t) { return 42; } // { dg-error "parameter" }
+constexpr int x = f(B());	     // { dg-error "constexpr function" }