Index: cp/decl.c
===================================================================
--- cp/decl.c	(revision 265826)
+++ cp/decl.c	(working copy)
@@ -9621,8 +9621,9 @@ fold_sizeof_expr (tree t)
    an appropriate index type for the array.  If non-NULL, NAME is
    the name of the entity being declared.  */
 
-tree
-compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
+static tree
+compute_array_index_type_loc (location_t loc, tree name, tree size,
+			      tsubst_flags_t complain)
 {
   tree itype;
   tree osize = size;
@@ -9658,7 +9659,8 @@ fold_sizeof_expr (tree t)
 	  if (!(complain & tf_error))
 	    return error_mark_node;
 	  if (name)
-	    error ("size of array %qD has non-integral type %qT", name, type);
+	    error_at (loc, "size of array %qD has non-integral type %qT",
+		      name, type);
 	  else
 	    error ("size of array has non-integral type %qT", type);
 	  size = integer_one_node;
@@ -9689,8 +9691,14 @@ fold_sizeof_expr (tree t)
     {
       tree folded = cp_fully_fold (size);
       if (TREE_CODE (folded) == INTEGER_CST)
-	pedwarn (input_location, OPT_Wpedantic,
-		 "size of array is not an integral constant-expression");
+	{
+	  if (name)
+	    pedwarn (loc, OPT_Wpedantic, "size of array %qD is not an "
+		     "integral constant-expression", name);
+	  else
+	    pedwarn (input_location, OPT_Wpedantic,
+		     "size of array is not an integral constant-expression");
+	}
       /* Use the folded result for VLAs, too; it will have resolved
 	 SIZEOF_EXPR.  */
       size = folded;
@@ -9706,7 +9714,7 @@ fold_sizeof_expr (tree t)
 	    return error_mark_node;
 
 	  if (name)
-	    error ("size of array %qD is negative", name);
+	    error_at (loc, "size of array %qD is negative", name);
 	  else
 	    error ("size of array is negative");
 	  size = integer_one_node;
@@ -9722,9 +9730,11 @@ fold_sizeof_expr (tree t)
 	  else if (in_system_header_at (input_location))
 	    /* Allow them in system headers because glibc uses them.  */;
 	  else if (name)
-	    pedwarn (input_location, OPT_Wpedantic, "ISO C++ forbids zero-size array %qD", name);
+	    pedwarn (loc, OPT_Wpedantic,
+		     "ISO C++ forbids zero-size array %qD", name);
 	  else
-	    pedwarn (input_location, OPT_Wpedantic, "ISO C++ forbids zero-size array");
+	    pedwarn (input_location, OPT_Wpedantic,
+		     "ISO C++ forbids zero-size array");
 	}
     }
   else if (TREE_CONSTANT (size)
@@ -9737,8 +9747,9 @@ fold_sizeof_expr (tree t)
 	return error_mark_node;
       /* `(int) &fn' is not a valid array bound.  */
       if (name)
-	error ("size of array %qD is not an integral constant-expression",
-	       name);
+	error_at (loc,
+		  "size of array %qD is not an integral constant-expression",
+		  name);
       else
 	error ("size of array is not an integral constant-expression");
       size = integer_one_node;
@@ -9746,15 +9757,17 @@ fold_sizeof_expr (tree t)
   else if (pedantic && warn_vla != 0)
     {
       if (name)
-	pedwarn (input_location, OPT_Wvla, "ISO C++ forbids variable length array %qD", name);
+	pedwarn (loc, OPT_Wvla,
+		 "ISO C++ forbids variable length array %qD", name);
       else
-	pedwarn (input_location, OPT_Wvla, "ISO C++ forbids variable length array");
+	pedwarn (input_location, OPT_Wvla,
+		 "ISO C++ forbids variable length array");
     }
   else if (warn_vla > 0)
     {
       if (name)
-	warning (OPT_Wvla, 
-                 "variable length array %qD is used", name);
+	warning_at (loc, OPT_Wvla, 
+		    "variable length array %qD is used", name);
       else
 	warning (OPT_Wvla, 
                  "variable length array is used");
@@ -9821,6 +9834,12 @@ fold_sizeof_expr (tree t)
   return itype;
 }
 
+tree
+compute_array_index_type (tree name, tree size, tsubst_flags_t complain)
+{
+  return compute_array_index_type_loc (input_location, name, size, complain);
+}
+
 /* Returns the scope (if any) in which the entity declared by
    DECLARATOR will be located.  If the entity was declared with an
    unqualified name, NULL_TREE is returned.  */
@@ -9922,7 +9941,8 @@ create_array_type_for_decl (tree name, tree type,
 
   /* Figure out the index type for the array.  */
   if (size)
-    itype = compute_array_index_type (name, size, tf_warning_or_error);
+    itype = compute_array_index_type_loc (loc, name, size,
+					  tf_warning_or_error);
 
   /* [dcl.array]
      T is called the array element type; this type shall not be [...] an
Index: testsuite/g++.dg/cpp0x/constexpr-47969.C
===================================================================
--- testsuite/g++.dg/cpp0x/constexpr-47969.C	(revision 265826)
+++ testsuite/g++.dg/cpp0x/constexpr-47969.C	(working copy)
@@ -8,4 +8,5 @@ struct A
 
 constexpr A a = A();
 
-int ar[a]; // { dg-error "could not convert|has non-integral type" }
+int ar[a]; // { dg-error "could not convert" }
+// { dg-error "5:size of array .ar. has non-integral" "" { target c++11 } .-1 }
Index: testsuite/g++.dg/cpp0x/constexpr-48324.C
===================================================================
--- testsuite/g++.dg/cpp0x/constexpr-48324.C	(revision 265826)
+++ testsuite/g++.dg/cpp0x/constexpr-48324.C	(working copy)
@@ -10,4 +10,4 @@ constexpr const int& to_ref(int i) {
   return S(i).val; // { dg-warning "reference to temporary" }
 }
 
-constexpr int ary[to_ref(98)] = { }; // { dg-error "not an integral" }
+constexpr int ary[to_ref(98)] = { }; // { dg-error "15:size of array .ary. is not an integral" }
Index: testsuite/g++.dg/cpp0x/constexpr-ex2.C
===================================================================
--- testsuite/g++.dg/cpp0x/constexpr-ex2.C	(revision 265826)
+++ testsuite/g++.dg/cpp0x/constexpr-ex2.C	(working copy)
@@ -18,5 +18,5 @@ constexpr A a = 42;
 
 X<a> x;	    // OK: unique conversion to int
 int ar[X<a>::i]; // also OK
-int ary[a]; // { dg-error "could not convert|ambiguous|conversion|array" } ambiguous conversion
-
+int ary[a]; // { dg-error "could not convert" } ambiguous conversion
+// { dg-error "5:size of array .ary. has non-integral" "" { target c++11 } .-1 }
Index: testsuite/g++.dg/cpp0x/scoped_enum2.C
===================================================================
--- testsuite/g++.dg/cpp0x/scoped_enum2.C	(revision 265826)
+++ testsuite/g++.dg/cpp0x/scoped_enum2.C	(working copy)
@@ -4,7 +4,8 @@ enum class E { e = 10 };
 enum E2 { e2 = 10 };
 
 struct C {
-  int arr[E::e];    // { dg-error "could not convert|non-integral type" }
+  int arr[E::e];    // { dg-error "could not convert" }
+// { dg-error "7:size of array .arr. has non-integral" "" { target c++11 } .-1 }
   int arr2[E2::e2]; // OK
   int i: E::e;	    // { dg-error "could not convert|non-integral type" }
   int i2: E2::e2;   // OK
Index: testsuite/g++.dg/cpp1y/pr63996.C
===================================================================
--- testsuite/g++.dg/cpp1y/pr63996.C	(revision 265826)
+++ testsuite/g++.dg/cpp1y/pr63996.C	(working copy)
@@ -4,7 +4,7 @@
 constexpr int
 foo (int i)
 {
-  int a[i] = { }; // { dg-error "forbids variable length" }
+  int a[i] = { }; // { dg-error "7:ISO C\\+\\+ forbids variable length array .a" }
 }
 
 constexpr int j = foo (1); // { dg-error "flows off the end|in .constexpr. expansion of" }
Index: testsuite/g++.dg/ext/constexpr-vla5.C
===================================================================
--- testsuite/g++.dg/ext/constexpr-vla5.C	(revision 265826)
+++ testsuite/g++.dg/ext/constexpr-vla5.C	(working copy)
@@ -3,5 +3,6 @@
 
 void foo(int i)
 {
-  constexpr char x[i] = "";	// { dg-error "" }
+  constexpr char x[i] = "";	// { dg-error ".constexpr. variable .x" }
+// { dg-error "18:ISO C\\+\\+ forbids variable length array .x" "" { target c++11 } .-1 }  
 }
Index: testsuite/g++.dg/ext/stmtexpr15.C
===================================================================
--- testsuite/g++.dg/ext/stmtexpr15.C	(revision 265826)
+++ testsuite/g++.dg/ext/stmtexpr15.C	(working copy)
@@ -3,5 +3,6 @@
 
 void foo()
 {
-  int x[({ return; })];		// { dg-error "could not convert|non-integral" }
+  int x[({ return; })];		// { dg-error "could not convert" }
+// { dg-error "7:size of array .x. has non-integral" "" { target *-*-* } .-1 }  
 }
Index: testsuite/g++.dg/ext/vla1.C
===================================================================
--- testsuite/g++.dg/ext/vla1.C	(revision 265826)
+++ testsuite/g++.dg/ext/vla1.C	(working copy)
@@ -9,7 +9,7 @@ class A { A (int); };
 
 A::A (int i)
 {
-  int ar[1][i];    // { dg-error "array" }
+  int ar[1][i];    // { dg-error "7:ISO C\\+\\+ forbids variable length array .ar" }
 
   ar[0][0] = 0;
 }
@@ -19,7 +19,8 @@ class B { B (int); };
 B::B (int i)
 {
   struct S {
-    int ar[1][i];  // { dg-error "array" }
+    int ar[1][i];  // { dg-error "9:size of array .ar. is not an integral" "" { target c++11 } }
+// { dg-error "array bound" "" { target c++98_only } .-1 }
   } s;
 
   s.ar[0][0] = 0;  // { dg-prune-output "no member" }
Index: testsuite/g++.dg/other/fold1.C
===================================================================
--- testsuite/g++.dg/other/fold1.C	(revision 265826)
+++ testsuite/g++.dg/other/fold1.C	(working copy)
@@ -4,5 +4,5 @@
 struct A
 {
     static const int i = i;  // { dg-error "not declared" }
-    int x[i];		     // { dg-error "constant-expression|narrowing conversion" }
+    int x[i];		     // { dg-error "9:size of array .x. is not an integral constant-expression" }
 };
Index: testsuite/g++.dg/parse/array-size2.C
===================================================================
--- testsuite/g++.dg/parse/array-size2.C	(revision 265826)
+++ testsuite/g++.dg/parse/array-size2.C	(working copy)
@@ -14,7 +14,7 @@ extern void bar (char *, char *);
 void
 foo (void)
 {
-  char g[(char *) &((struct S *) 0)->b - (char *) 0]; // { dg-error "constant|narrowing conversion" }
-  char h[(__SIZE_TYPE__) &((struct S *) 8)->b];	      // { dg-error "constant" }
+  char g[(char *) &((struct S *) 0)->b - (char *) 0]; // { dg-error "8:size of array .g. is not an integral constant-expression" }
+  char h[(__SIZE_TYPE__) &((struct S *) 8)->b];	      // { dg-error "8:size of array .h. is not an integral constant-expression" }
   bar (g, h);
 }
Index: testsuite/g++.dg/parse/crash36.C
===================================================================
--- testsuite/g++.dg/parse/crash36.C	(revision 265826)
+++ testsuite/g++.dg/parse/crash36.C	(working copy)
@@ -9,4 +9,4 @@ template <typename... T> struct A	// { dg-warning
   static const int i = sizeof (++t);	// { dg-error "was not declared in this scope" }
 };
 
-int x[A <int>::i];		// { dg-error "constant-expression" }
+int x[A <int>::i];		// { dg-error "5:size of array .x. is not an integral constant-expression" }
Index: testsuite/g++.dg/ubsan/pr81530.C
===================================================================
--- testsuite/g++.dg/ubsan/pr81530.C	(revision 265826)
+++ testsuite/g++.dg/ubsan/pr81530.C	(working copy)
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-fsanitize=undefined" } */
 
-int a[(long) 4e20]; /* { dg-error "size of array .a. is (too large|negative)" } */
+int a[(long) 4e20]; /* { dg-error "5:size of array .a. is (too large|negative)" } */
Index: testsuite/g++.dg/warn/Wvla-1.C
===================================================================
--- testsuite/g++.dg/warn/Wvla-1.C	(revision 265826)
+++ testsuite/g++.dg/warn/Wvla-1.C	(working copy)
@@ -4,5 +4,5 @@
 
 void func (int i)
 {
-  int array[i]; /* { dg-warning "variable length array 'array' is used" } */
+  int array[i]; /* { dg-warning "7:variable length array 'array' is used" } */
 }
Index: testsuite/g++.dg/warn/Wvla-2.C
===================================================================
--- testsuite/g++.dg/warn/Wvla-2.C	(revision 265826)
+++ testsuite/g++.dg/warn/Wvla-2.C	(working copy)
@@ -3,5 +3,5 @@
 
 void func (int i)
 {
-  int array[i]; /* { dg-error "ISO C.* forbids variable.* array 'array'" } */
+  int array[i]; /* { dg-error "7:ISO C.* forbids variable.* array 'array'" } */
 }
Index: testsuite/g++.old-deja/g++.brendan/array1.C
===================================================================
--- testsuite/g++.old-deja/g++.brendan/array1.C	(revision 265826)
+++ testsuite/g++.old-deja/g++.brendan/array1.C	(working copy)
@@ -2,5 +2,5 @@
 // GROUPS passed array-bindings
 
 extern "C" int printf (const char *, ...);
-char array[~(~((__SIZE_TYPE__)0ul)>>1)|~(((__SIZE_TYPE__)0ul)>>3)];  // { dg-error "" } overflow in array dimension.*
+char array[~(~((__SIZE_TYPE__)0ul)>>1)|~(((__SIZE_TYPE__)0ul)>>3)];  // { dg-error "6:size of array .array. is negative" } overflow in array dimension.*
 int main () { printf ("PASS\n"); return 0; }
Index: testsuite/g++.old-deja/g++.bugs/900402_02.C
===================================================================
--- testsuite/g++.old-deja/g++.bugs/900402_02.C	(revision 265826)
+++ testsuite/g++.old-deja/g++.bugs/900402_02.C	(working copy)
@@ -6,17 +6,17 @@
 
 // keywords: arrays, array bound, zero length
 
-typedef int array_type[0];		// { dg-error "zero-size array" }
+typedef int array_type[0];		// { dg-error "13:ISO C\\+\\+ forbids zero-size array" }
 
-int array_object_1[0];			// { dg-error "zero-size array" }
+int array_object_1[0];			// { dg-error "5:ISO C\\+\\+ forbids zero-size array" }
 
-void function_0 (int formal_array[0])	// { dg-error "zero-size array" }
+void function_0 (int formal_array[0])	// { dg-error "22:ISO C\\+\\+ forbids zero-size array" }
 {
 }
 
 void function_2 ()
 {
-  int local_object_array_0[0];		// { dg-error "zero-size array" }
+  int local_object_array_0[0];		// { dg-error "7:ISO C\\+\\+ forbids zero-size array" }
 }
 
 int main () { return 0; }
Index: testsuite/g++.old-deja/g++.law/init3.C
===================================================================
--- testsuite/g++.old-deja/g++.law/init3.C	(revision 265826)
+++ testsuite/g++.old-deja/g++.law/init3.C	(working copy)
@@ -8,5 +8,5 @@
 
 int main() {
 int offset;
-char buf[offset]=""; // { dg-error "" } ansi forbids variable arrays
+char buf[offset]=""; // { dg-error "6:ISO C\\+\\+ forbids variable length array .buf" } ansi forbids variable arrays
 }
Index: testsuite/g++.old-deja/g++.mike/p6149.C
===================================================================
--- testsuite/g++.old-deja/g++.mike/p6149.C	(revision 265826)
+++ testsuite/g++.old-deja/g++.mike/p6149.C	(working copy)
@@ -1,4 +1,4 @@
 // { dg-do assemble  }
 // prms-id: 6149
 
-int a[3 - sizeof(double)];	// { dg-error "" } 
+int a[3 - sizeof(double)];	// { dg-error "5:size of array .a. is negative" } 
