[patch] const array types

[Ken Werner <ken at linux dot vnet dot ibm dot com>]

Hi,

The attached patch changes the dwarf parsing of const types. In case the const 
qualifier is applied to an array type, the element type is so qualified, not the 
array type. Comments are welcome.

Thanks
Ken Werner

ChangeLog:

2010-09-15  Ken Werner  <ken.werner@de.ibm.com>

	* gdb/dwarf2read.c (read_tag_const_type): Handle const arrays.

testsuite/ChangeLog:

2010-09-15  Ken Werner  <ken.werner@de.ibm.com>

	* gdb.base/constvars.c (logical, lugged, luck, lunar, lumen, lurk,
	lush, lynx) New constant.
	* gdb.base/constvars.exp: Test const array types.
	* gdb.dwarf2/dw2-strp.exp: Add const qualifier for ptype tests.

Index: gdb/dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.457
diff -p -u -r1.457 dwarf2read.c
--- gdb/dwarf2read.c	14 Sep 2010 21:28:53 -0000	1.457
+++ gdb/dwarf2read.c	15 Sep 2010 16:26:41 -0000
@@ -7617,6 +7617,29 @@ read_tag_const_type (struct die_info *di
   if (cv_type)
     return cv_type;
 
+  /* In case the const qualifier is applied to an array type, the element type
+     is so qualified, not the array type (section 6.7.3 of C99).  */
+  if (TYPE_CODE (base_type) == TYPE_CODE_ARRAY)
+    {
+      struct type *el_type, *inner_array;
+
+      base_type = copy_type (base_type);
+      inner_array = base_type;
+
+      while (TYPE_CODE (TYPE_TARGET_TYPE (inner_array)) == TYPE_CODE_ARRAY)
+	{
+	  TYPE_TARGET_TYPE (inner_array) =
+	    copy_type (TYPE_TARGET_TYPE (inner_array));
+	  inner_array = TYPE_TARGET_TYPE (inner_array);
+	}
+
+      el_type = TYPE_TARGET_TYPE (inner_array);
+      TYPE_TARGET_TYPE (inner_array) =
+	make_cv_type (1, TYPE_VOLATILE (el_type), el_type, 0);
+
+      return set_die_type (die, base_type, cu);;
+    }
+
   cv_type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0);
   return set_die_type (die, cv_type, cu);
 }
Index: gdb/testsuite/gdb.base/constvars.c
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/constvars.c,v
retrieving revision 1.4
diff -p -u -r1.4 constvars.c
--- gdb/testsuite/gdb.base/constvars.c	12 Nov 2009 19:35:26 -0000	1.4
+++ gdb/testsuite/gdb.base/constvars.c	15 Sep 2010 16:26:41 -0000
@@ -84,6 +84,16 @@ main (void)
   float          *const   lissome   = &leeway;
   double         *const   locust    = &legacy;
 
+  /* constant arrays */
+  const char logical[2] = {laconic, laconic};
+  const unsigned char lugged[2] = {laggard, laggard};
+  const short luck[2] = {lagoon, lagoon};
+  const unsigned short lunar[2] = {laity, laity};
+  const long lumen[2] = {lambent, lambent};
+  const unsigned long lurk[2] = {laminated, laminated};
+  const float lush[2] = {lampoon, lampoon};
+  const double lynx[2] = {languid, languid};
+
   /* volatile variables */
 
   volatile char vox = 'X';
Index: gdb/testsuite/gdb.base/constvars.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/constvars.exp,v
retrieving revision 1.23
diff -p -u -r1.23 constvars.exp
--- gdb/testsuite/gdb.base/constvars.exp	24 May 2010 22:03:59 -0000	1.23
+++ gdb/testsuite/gdb.base/constvars.exp	15 Sep 2010 16:26:41 -0000
@@ -253,6 +253,16 @@ proc do_constvar_tests {} {
     gdb_test "ptype locust" "type = double \\* const"
 
     local_compiler_xfail_check
+    gdb_test "ptype logical" "type = const char \\\[2\\\]"
+    gdb_test "ptype lugged" "type = const unsigned char \\\[2\\\]"
+    gdb_test "ptype luck" "type = const short( int)? \\\[2\\\]"
+    gdb_test "ptype lunar" "type = const (unsigned short|short unsigned)( int)? \\\[2\\\]"
+    gdb_test "ptype lumen" "type = const long( int)? \\\[2\\\]"
+    gdb_test "ptype lurk" "type = const (unsigned long|long unsigned)( int)? \\\[2\\\]"
+    gdb_test "ptype lush" "type = const float \\\[2\\\]"
+    gdb_test "ptype lynx" "type = const double \\\[2\\\]"
+
+    local_compiler_xfail_check
     local_compiler_xfail_check_2
     gdb_test "ptype crass" "type = struct crass \{\[\r\n\]+\[\ \t\]+char \\* const ptr;\[\r\n\]+\}"
     local_compiler_xfail_check
Index: gdb/testsuite/gdb.dwarf2/dw2-strp.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-strp.exp,v
retrieving revision 1.4
diff -p -u -r1.4 dw2-strp.exp
--- gdb/testsuite/gdb.dwarf2/dw2-strp.exp	1 Jan 2010 07:32:02 -0000	1.4
+++ gdb/testsuite/gdb.dwarf2/dw2-strp.exp	15 Sep 2010 17:14:32 -0000
@@ -49,7 +49,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 gdb_test "p a_string" " = \"hello world!\\\\n\""
-gdb_test "ptype a_string" "type = char \\\[14\\\]"
+gdb_test "ptype a_string" "type = const char \\\[14\\\]"
 
 gdb_test "p a_string2" " = \"hello world2\\\\n\""
-gdb_test "ptype a_string2" "type = char \\\[14\\\]"
+gdb_test "ptype a_string2" "type = const char \\\[14\\\]"