[patch 1/2] Fix physname regression: c/v types quals (PR c++/12328)

[patch 1/2] Fix physname regression: c/v types quals (PR c++/12328)

[Jan Kratochvil]

Hi Keith,

do you agree for a check-in?

This fixes a C++ regression by the patch:
	42284fdf9d8cdb20c8e833bdbdb2b56977fea525
	http://sourceware.org/ml/gdb-cvs/2010-03/msg00082.html
	dwarf2_physname patchset:
	[RFA] dwarf2_physname FINAL
	http://sourceware.org/ml/gdb-patches/2010-03/msg00220.html

No regressions on {x86_64,x86_64-m32,i686}-fedora14-linux-gnu.


Thanks,
Jan


gdb/
2011-02-06  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Fix const/volatile qualifiers of C++ types, PR c++/12328.
	* c-typeprint.c (c_type_print_args): Update the function comment.  New
	variable param_type, initialize it.  Remove const/volatile qualifiers
	for language_cplus and !show_artificial.  Use param_type.

gdb/testsuite/
2011-02-06  Jan Kratochvil  <jan.kratochvil@redhat.com>

	Fix const/volatile qualifiers of C++ types, PR c++/12328.
	* gdb.cp/overload-const.exp: New file.
	* gdb.cp/overload-const.cc: New file.

--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -388,9 +388,12 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
 /* Print out the arguments of TYPE, which should have TYPE_CODE_METHOD
    or TYPE_CODE_FUNC, to STREAM.  Artificial arguments, such as "this"
    in non-static methods, are displayed if SHOW_ARTIFICIAL is
-   non-zero.  LANGUAGE is the language in which TYPE was defined.
-   This is a necessary evil since this code is used by the C, C++, and
-   Java backends.  */
+   non-zero.  If SHOW_ARTIFICIAL is zero and LANGUAGE is language_cplus
+   the topmost parameter types get removed their possible const and volatile
+   qualifiers to match demangled linkage name parameters part of such function
+   type.  LANGUAGE is the language in which TYPE was defined.  This is
+   a necessary evil since this code is used by the C, C++, and Java backends.
+   */
 
 void
 c_type_print_args (struct type *type, struct ui_file *stream,
@@ -406,6 +409,8 @@ c_type_print_args (struct type *type, struct ui_file *stream,
 
   for (i = 0; i < TYPE_NFIELDS (type); i++)
     {
+      struct type *param_type;
+
       if (TYPE_FIELD_ARTIFICIAL (type, i) && !show_artificial)
 	continue;
 
@@ -415,12 +420,24 @@ c_type_print_args (struct type *type, struct ui_file *stream,
 	  wrap_here ("    ");
 	}
 
+      param_type = TYPE_FIELD_TYPE (type, i);
+
+      if (language == language_cplus && !show_artificial)
+	{
+	  /* C++ standard, 13.1 Overloadable declarations, point 3, item:
+	     - Parameter declarations that differ only in the presence or
+	       absence of const and/or volatile are equivalent.
+
+	     And the const/volatile qualifiers are not present in the mangled
+	     names as produced by GCC.  */
+
+	  param_type = make_cv_type (0, 0, param_type, NULL);
+	}
+
       if (language == language_java)
-	java_print_type (TYPE_FIELD_TYPE (type, i),
-			 "", stream, -1, 0);
+	java_print_type (param_type, "", stream, -1, 0);
       else
-	c_print_type (TYPE_FIELD_TYPE (type, i),
-		      "", stream, -1, 0);
+	c_print_type (param_type, "", stream, -1, 0);
       printed_any = 1;
     }
 
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/overload-const.cc
@@ -0,0 +1,28 @@
+/* This test case is part of GDB, the GNU debugger.
+
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+class myclass
+{
+public:
+  static void func(const int aa) {}
+};
+
+int
+main ()
+{
+  myclass::func (42);
+}
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/overload-const.exp
@@ -0,0 +1,29 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This file is part of the gdb testsuite.
+
+if {[skip_cplus_tests]} { continue }
+
+set testfile "overload-const"
+if [prepare_for_testing $testfile $testfile $testfile.cc {c++ debug}] {
+    return -1
+}
+
+gdb_test_no_output "set language c++"
+
+if [gdb_breakpoint "myclass::func"] {
+    pass "setting breakpoint at myclass::func"
+}

Re: [patch 1/2] Fix physname regression: c/v types quals (PR c++/12328)

[Keith Seitz]

On 02/06/2011 10:12 AM, Jan Kratochvil wrote:
> do you agree for a check-in?
>

Yes, that looks good to me. Thanks for taking a look into this.

Keith

Re: [patch 1/2] Fix physname regression: c/v types quals (PR c++/12328)

[Jan Kratochvil]

On Thu, 10 Feb 2011 22:51:34 +0100, Keith Seitz wrote:
> On 02/06/2011 10:12 AM, Jan Kratochvil wrote:
> >do you agree for a check-in?
> 
> Yes, that looks good to me. Thanks for taking a look into this.

Checked in:
	http://sourceware.org/ml/gdb-cvs/2011-02/msg00064.html

This part fixes the part (a) - DW_AT_linkage_name drop - as discussed in:
	http://sourceware.org/ml/gdb-patches/2011-02/msg00115.html

This part is a definitive improvement of the physname patch and this patch
just fixes its regression.


Thanks,
Jan