[C++] Improve create_array_type_for_decl locations

Message ID 44aea7d3-6c72-15d9-3d39-0a11765c4527@oracle.com
State New
Headers show
Series
  • [C++] Improve create_array_type_for_decl locations
Related show

Commit Message

Paolo Carlini Oct. 29, 2018, 10:12 a.m.
Hi,

while working on something else I noticed that by adding a location_t 
parameter we can improve the locations of those error messages. Tested 
x86_64-linux.

Thanks, Paolo.

/////////////////////
/cp
2018-10-29  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (create_array_type_for_decl): Add location_t parameter
	and use it.
	(grokdeclarator): Adjust call.

/testsuite
2018-10-29  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/auto24.C: Test location too.
	* g++.dg/cpp0x/auto3.C: Likewise.
	* g++.dg/cpp0x/auto42.C: Likewise.
	* g++.dg/cpp0x/initlist57.C: Likewise.
	* g++.dg/cpp0x/initlist75.C: Likewise.
	* g++.dg/cpp0x/initlist80.C: Likewise.
	* g++.dg/cpp0x/lambda/lambda-ice13.C: Likewise.
	* g++.old-deja/g++.brendan/array-refs.C: Likewise.
	* g++.old-deja/g++.bugs/900322_01.C: Likewise.
	* g++.old-deja/g++.bugs/900519_07.C: Likewise.
	* g++.old-deja/g++.other/typeck1.C: Likewise.

Comments

Jason Merrill Oct. 29, 2018, 7:36 p.m. | #1
On 10/29/18 6:12 AM, Paolo Carlini wrote:
> Hi,

> 

> while working on something else I noticed that by adding a location_t 

> parameter we can improve the locations of those error messages. Tested 

> x86_64-linux.


OK.

Jason

Patch

Index: cp/decl.c
===================================================================
--- cp/decl.c	(revision 265582)
+++ cp/decl.c	(working copy)
@@ -88,7 +88,7 @@  static void finish_constructor_body (void);
 static void begin_destructor_body (void);
 static void finish_destructor_body (void);
 static void record_key_method_defined (tree);
-static tree create_array_type_for_decl (tree, tree, tree);
+static tree create_array_type_for_decl (tree, tree, tree, location_t);
 static tree get_atexit_node (void);
 static tree get_dso_handle_node (void);
 static tree start_cleanup_fn (void);
@@ -9835,7 +9837,7 @@  get_scope_of_declarator (const cp_declarator *decl
    with this type.  */
 
 static tree
-create_array_type_for_decl (tree name, tree type, tree size)
+create_array_type_for_decl (tree name, tree type, tree size, location_t loc)
 {
   tree itype = NULL_TREE;
 
@@ -9848,9 +9850,9 @@  static tree
   if (type_uses_auto (type))
     {
       if (name)
-   error ("%qD declared as array of %qT", name, type);
+	error_at (loc, "%qD declared as array of %qT", name, type);
       else
-   error ("creating array of %qT", type);
+	error ("creating array of %qT", type);
       return error_mark_node;
     }
 
@@ -9860,7 +9862,7 @@  static tree
     {
     case VOID_TYPE:
       if (name)
-        error ("declaration of %qD as array of void", name);
+	error_at (loc, "declaration of %qD as array of void", name);
       else
         error ("creating array of void");
       return error_mark_node;
@@ -9867,7 +9869,7 @@  static tree
 
     case FUNCTION_TYPE:
       if (name)
-        error ("declaration of %qD as array of functions", name);
+	error_at (loc, "declaration of %qD as array of functions", name);
       else
         error ("creating array of functions");
       return error_mark_node;
@@ -9874,7 +9876,7 @@  static tree
 
     case REFERENCE_TYPE:
       if (name)
-        error ("declaration of %qD as array of references", name);
+	error_at (loc, "declaration of %qD as array of references", name);
       else
         error ("creating array of references");
       return error_mark_node;
@@ -9881,7 +9883,8 @@  static tree
 
     case METHOD_TYPE:
       if (name)
-        error ("declaration of %qD as array of function members", name);
+	error_at (loc, "declaration of %qD as array of function members",
+		  name);
       else
         error ("creating array of function members");
       return error_mark_node;
@@ -9897,9 +9900,9 @@  static tree
   if (TREE_CODE (type) == ARRAY_TYPE && !TYPE_DOMAIN (type))
     {
       if (name)
-	error ("declaration of %qD as multidimensional array must "
-	       "have bounds for all dimensions except the first",
-	       name);
+	error_at (loc, "declaration of %qD as multidimensional array must "
+		  "have bounds for all dimensions except the first",
+		  name);
       else
 	error ("multidimensional array must have bounds for all "
 	       "dimensions except the first");
@@ -11164,7 +11167,8 @@  grokdeclarator (const cp_declarator *declarator,
 	{
 	case cdk_array:
 	  type = create_array_type_for_decl (dname, type,
-					     declarator->u.array.bounds);
+					     declarator->u.array.bounds,
+					     declarator->id_loc);
 	  if (!valid_array_size_p (input_location, type, dname))
 	    type = error_mark_node;
 
Index: testsuite/g++.dg/cpp0x/auto24.C
===================================================================
--- testsuite/g++.dg/cpp0x/auto24.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/auto24.C	(working copy)
@@ -2,4 +2,4 @@ 
 // { dg-do compile { target c++11 } }
 
 int v[1];
-auto (*p)[1] = &v;		// { dg-error "array of .auto" }
+auto (*p)[1] = &v;		// { dg-error "8:.p. declared as array of .auto" }
Index: testsuite/g++.dg/cpp0x/auto3.C
===================================================================
--- testsuite/g++.dg/cpp0x/auto3.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/auto3.C	(working copy)
@@ -10,7 +10,7 @@  auto x;				// { dg-error "auto" }
 auto i = 42, j = 42.0;		// { dg-error "auto" }
 
 // New CWG issue
-auto a[2] = { 1, 2 };		// { dg-error "auto|initializer_list" }
+auto a[2] = { 1, 2 };		// { dg-error "6:.a. declared as array of .auto" }
 
 template<class T>
 struct A { };
Index: testsuite/g++.dg/cpp0x/auto42.C
===================================================================
--- testsuite/g++.dg/cpp0x/auto42.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/auto42.C	(working copy)
@@ -5,5 +5,5 @@ 
 
 void foo(int i)
 {
-  auto x[1] = { 0 };		// { dg-error "array of .auto" }
+  auto x[1] = { 0 };		// { dg-error "8:.x. declared as array of .auto" }
 }
Index: testsuite/g++.dg/cpp0x/initlist57.C
===================================================================
--- testsuite/g++.dg/cpp0x/initlist57.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/initlist57.C	(working copy)
@@ -1,7 +1,7 @@ 
 // PR c++/50054
 // { dg-do compile { target c++11 } }
 
-void g( const int& (a)[1] ) {}	// { dg-error "array of references" }
+void g( const int& (a)[1] ) {}	// { dg-error "21:declaration of .a. as array of references" }
 
 int main () {
     g( { 1, 2 } );		// { dg-error "initializer list" }
Index: testsuite/g++.dg/cpp0x/initlist75.C
===================================================================
--- testsuite/g++.dg/cpp0x/initlist75.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/initlist75.C	(working copy)
@@ -3,4 +3,4 @@ 
 
 #include <initializer_list>
 
-auto foo[] = {};    // { dg-error "auto|unable to deduce" }
+auto foo[] = {};    // { dg-error "6:.foo. declared as array of .auto" }
Index: testsuite/g++.dg/cpp0x/initlist80.C
===================================================================
--- testsuite/g++.dg/cpp0x/initlist80.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/initlist80.C	(working copy)
@@ -3,4 +3,4 @@ 
 
 #include <initializer_list>
 
-auto x[2] = {};			// { dg-error "" }
+auto x[2] = {};			// { dg-error "6:.x. declared as array of .auto" }
Index: testsuite/g++.dg/cpp0x/lambda/lambda-ice13.C
===================================================================
--- testsuite/g++.dg/cpp0x/lambda/lambda-ice13.C	(revision 265510)
+++ testsuite/g++.dg/cpp0x/lambda/lambda-ice13.C	(working copy)
@@ -10,5 +10,6 @@  void f()
 void g()
 {
   typedef void (X) ();
-  X x[] = { [x](){} };  // { dg-error "array of functions|not declared" }
+  X x[] = { [x](){} };  // { dg-error "5:declaration of .x. as array of functions" }
+  // { dg-error "not declared" "" { target *-*-* } .-1 }
 }
Index: testsuite/g++.old-deja/g++.brendan/array-refs.C
===================================================================
--- testsuite/g++.old-deja/g++.brendan/array-refs.C	(revision 265510)
+++ testsuite/g++.old-deja/g++.brendan/array-refs.C	(working copy)
@@ -3,4 +3,4 @@ 
 int a, b;
 
 // declaring an array of references should be illegal
-int & v[ 2] = { a, b};// { dg-error "" } .*
+int & v[ 2] = { a, b};  // { dg-error "7:declaration of .v. as array of references" }
Index: testsuite/g++.old-deja/g++.bugs/900322_01.C
===================================================================
--- testsuite/g++.old-deja/g++.bugs/900322_01.C	(revision 265510)
+++ testsuite/g++.old-deja/g++.bugs/900322_01.C	(working copy)
@@ -33,24 +33,25 @@ 
 
 // keywords: incomplete types, arrays, element types
 
-extern int extern_two_d [] [];		// { dg-error "" } invalid declaration
-int tenative_two_d [] [];		// { dg-error "" } caught by g++
-static int static_two_d [] [];		// { dg-error "" } caught by g++
+extern int extern_two_d [] [];		// { dg-error "12:declaration of .extern_two_d. as multidimensional" } invalid declaration
+int tenative_two_d [] [];		// { dg-error "5:declaration of .tenative_two_d. as multidimensional" } caught by g++
+static int static_two_d [] [];		// { dg-error "12:declaration of .static_two_d. as multidimensional" } caught by g++
 
-int (*pointer_to_two_d)[][];		// { dg-error "" } invalid declaration
+int (*pointer_to_two_d)[][];		// { dg-error "7:declaration of .pointer_to_two_d. as multidimensional" } invalid declaration
 
-void function_0 (int arg [] []) {	// { dg-error "" } invalid declaration
+void function_0 (int arg [] []) {	// { dg-error "22:declaration of .arg. as multidimensional" } invalid declaration
 }
 
 typedef int int_one_d_type [];
-typedef int_one_d_type int_two_d_type[];// { dg-error "" } invalid declaration
+typedef int_one_d_type int_two_d_type[];// { dg-error "24:declaration of .int_two_d_type. as multidimensional" } invalid declaration
 
 struct s;
 
 extern struct s extern_s_array [10];	// OK
-struct s tenative_s_array [10];		// { dg-error "" } object with incomplete type
-static struct s static_s_array [10];	// { dg-error "" } object with incomplete type
-
+struct s tenative_s_array [10];		// { dg-error "10:elements of array .s tenative_s_array \\\[10\\\]. have incomplete type" } object with incomplete type
+// { dg-error "10:storage size" "" { target *-*-* } .-1 }
+static struct s static_s_array [10];	// { dg-error "17:elements of array .s static_s_array \\\[10\\\]. have incomplete type" } object with incomplete type
+// { dg-error "17:storage size" "" { target *-*-* } .-1 }
 struct s (*pointer_to_s_array) [];	// OK
 
 void function_1 (struct s arg []) {	// OK
Index: testsuite/g++.old-deja/g++.bugs/900519_07.C
===================================================================
--- testsuite/g++.old-deja/g++.bugs/900519_07.C	(revision 265510)
+++ testsuite/g++.old-deja/g++.bugs/900519_07.C	(working copy)
@@ -11,7 +11,7 @@  int i;
 int j;
 
 typedef int& int_ref;
-typedef int_ref int_ref_array_type[2];		// { dg-error "" } missed
+typedef int_ref int_ref_array_type[2];		// { dg-error "17:declaration of .int_ref_array_type. as array of references" } missed
 
-int& int_ref_array_obj0[2] = { i, j };		// { dg-error "" } missed
-int_ref int_ref_array_obj1[2] = { i, j };	// { dg-error "" } missed
+int& int_ref_array_obj0[2] = { i, j };		// { dg-error "6:declaration of .int_ref_array_obj0. as array of references" } missed
+int_ref int_ref_array_obj1[2] = { i, j };	// { dg-error "9:declaration of .int_ref_array_obj1. as array of references" } missed
Index: testsuite/g++.old-deja/g++.other/typeck1.C
===================================================================
--- testsuite/g++.old-deja/g++.other/typeck1.C	(revision 265510)
+++ testsuite/g++.old-deja/g++.other/typeck1.C	(working copy)
@@ -1,7 +1,7 @@ 
 // { dg-do assemble  }
 
-extern int a[][];   // { dg-error "" } invalid multidimensional array
-extern int b[7][];  // { dg-error "" } invalid multidimensional array
+extern int a[][];   // { dg-error "12:declaration of .a. as multidimensional array" } invalid multidimensional array
+extern int b[7][];  // { dg-error "12:declaration of .b. as multidimensional array" } invalid multidimensional array
 extern int c[][7];  // OK
 
 extern int (*i)[];  // { dg-message "" } previous declaration