Re: C++ member function template id not matching linkage name (PR debug/49408)
diff mbox

Message ID 20110627150431.GA24889@host1.jankratochvil.net
State New
Headers show

Commit Message

Jan Kratochvil June 27, 2011, 3:04 p.m. UTC
On Wed, 22 Jun 2011 17:42:34 +0200, Jason Merrill wrote:
> Well, the basic issue is that the "linkage name" is produced by
> libiberty/cp-demangle.c and the DW_AT_name is produced by
> gcc/cp/error.c, and they don't always agree on the same
> pretty-printed representation of a C++ expression.

Filed cross-check RFE GCC PR debug/49537 for it.


> >The function linkage name has prefix: K<&(S::m(int))>
> 
> This isn't actually valid C++ syntax, so the demangler should be adjusted.

Attached.  No regressions on gcc-4.6.0-10.fc15.x86_64.  OK for check it in?

It fixes (and GDB commands start to work):
K<&(S::m(int))>::f (this=0x7fffffffdcaf) at tmplmember.C:6
->
K<&S::m>::f (this=0x7fffffffdcaf) at tmplmember.C:6
BTW the above change is when using DW_AT_linkage_name; FSF GDB HEAD still uses
physname computation but that is also not right:
K<&(S::m)>::f (this=0x7fffffffdcaf) at tmplmember.C:6
------------------------------------------------------------------------------
struct S {
  void m (int x) {}
};
template<void (S::*F) (int)>
struct K {
  void f () { S s; (s.*F) (5); }
};
int main () {
  K<&S::m> k;
  k.f ();
}
------------------------------------------------------------------------------

Filed as GCC PR debug/49546 that GDB still does not work (*) for:
(*) without implementing - filed as GDB PR c++/12936:
On Wed, 22 Jun 2011 17:42:34 +0200, Jason Merrill wrote:
# > Or maybe it is not a bug and one just has to accept the function prefix may
# > not match its struct/class name?
# This would also be a good idea, for robustness when this kind of
# issue crops up.
------------------------------------------------------------------------------
struct S {
  static void m (int x) {}
};
template<void (*T) (int)>
// or: template<void (T) (int)>
struct K {
  void f () { T (0); }
};
int main () {
  K<&S::m> k;
// or: K<S::m> k;
  k.f ();
}
------------------------------------------------------------------------------

DWARF is exactly the for all the four combination of alternative lines.
In the member function pointer above no alternative source form gets compiled.

As both K<&S::m>::f() functions have exactly the same mangled name
_ZN1KIXadL_ZN1S1mEiEEE1fEv , the demangled names should match the source form
and in the first example it is the only allowed form of the source the
function should demangled to K<&S::m>::f() - as it is by the patch below.
But in the second example the template instace `struct K' DW_AT_name is
K<S::m> so it cannot match the function K<&S::m>::f() prefix.

But in the second case it also cannot always match the source form when
multiple source notations compile into exactly the same output.

FYI:
_ZN1KIXadL_ZN1S1mEiEEE1fEv
typed name
  qualified name
    template
      name 'K'
      template argument list
        unary operator
          operator &
          typed name
            qualified name
              name 'S'
              name 'm'
            function type
              argument list
                builtin type int
    name 'f'
  function type
    argument list


For GDB this patch resolves a regression of combination:
	Re: [patch] Follow DW_AT_linkage_name for methods #2
	http://sourceware.org/ml/gdb-patches/2011-06/msg00040.html
and
	FYI: updates to temargs.exp
	http://sourceware.org/ml/gdb-patches/2011-06/msg00138.html


On Wed, 22 Jun 2011 21:55:47 +0200, Gabriel Dos Reis wrote:
> I agree this isn't valid C++ syntax.  However, it is a syntax used in certain
> popular frameworks, e.g. QT signal/slots, and it unambiguously tells in a
> readable manner what function is intended from overload resolution perspective.

There is now for some time for the template:
 <2><92>: Abbrev Number: 11 (DW_TAG_template_value_param)
    <93>   DW_AT_name        : F        
    <95>   DW_AT_type        : <0x16f>  

pointing (<0x16f>) to the member function so it is more up to the debugger (or
front-end) to show it.  Had to file GDB PR c++/12933 for it, though.


Had to restrict the patch very much for the template function reference case as
otherwise the parameter types are required even in templates there.


Thanks,
Jan


libiberty/
2011-06-27  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* cp-demangle.c (d_print_comp): Suppress argument list for function
	references as template arguments.
	* testsuite/demangle-expected: 3 new testcases for it.

Comments

Jason Merrill June 27, 2011, 6 p.m. UTC | #1
On 06/27/2011 11:04 AM, Jan Kratochvil wrote:
> Had to restrict the patch very much for the template function reference case as
> otherwise the parameter types are required even in templates there.

They should be supressed whenever the function appears in an expression 
context, either as a pointer to member function (i.e. the operand of 
'&') or as the function being called in a call expression.

Jason

Patch
diff mbox

--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -4095,7 +4095,56 @@  d_print_comp (struct d_print_info *dpi, int options,
     case DEMANGLE_COMPONENT_ARGLIST:
     case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST:
       if (d_left (dc) != NULL)
-	d_print_comp (dpi, options, d_left (dc));
+	{
+	  const struct demangle_component *left = d_left (dc);
+
+	  if (dc->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST
+	      && left->type == DEMANGLE_COMPONENT_UNARY
+	      && d_left (left)->type == DEMANGLE_COMPONENT_OPERATOR
+	      && d_left (left)->u.s_operator.op->len == 1
+	      && d_left (left)->u.s_operator.op->name[0] == '&'
+	      && d_right (left)->type == DEMANGLE_COMPONENT_TYPED_NAME
+	      && d_left (d_right (left))->type == DEMANGLE_COMPONENT_QUAL_NAME
+	      && d_right (d_right (left))->type == DEMANGLE_COMPONENT_FUNCTION_TYPE)
+	    {
+	      /* Address of a function in template argument list must have its
+		 argument list suppressed.  The resolution is already not
+		 ambiguous due to the function type expected by the template.
+
+		 template argument list
+		   unary operator ... left
+		     operator & ... d_left (left)
+		     typed name ... d_right (left)
+		       qualified name ... d_left (d_right (left))
+			 <names>
+		       function type ... d_right (d_right (left))
+			 argument list
+			   <arguments>  */
+
+	      d_print_expr_op (dpi, options, d_left (left));
+	      d_print_comp (dpi, options, d_left (d_right (left)));
+	    }
+	  else if (dc->type == DEMANGLE_COMPONENT_TEMPLATE_ARGLIST
+	      && left->type == DEMANGLE_COMPONENT_UNARY
+	      && d_left (left)->type == DEMANGLE_COMPONENT_OPERATOR
+	      && d_left (left)->u.s_operator.op->len == 1
+	      && d_left (left)->u.s_operator.op->name[0] == '&'
+	      && d_right (left)->type == DEMANGLE_COMPONENT_QUAL_NAME)
+	    {
+	      /* Keep also already processed variant without the argument list.
+
+		 template argument list
+		   unary operator ... left
+		     operator & ... d_left (left)
+		     qualified name ... d_right (left)
+		       <names>  */
+
+	      d_print_expr_op (dpi, options, d_left (left));
+	      d_print_comp (dpi, options, d_right (left));
+	    }
+	  else
+	    d_print_comp (dpi, options, left);
+	}
       if (d_right (dc) != NULL)
 	{
 	  size_t len;
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -3990,6 +3990,18 @@  outer(short (*)(int), long)
 _Z6outer2IsEPFilES1_
 outer2<short>(int (*)(long))
 #
+--format=gnu-v3 --no-params
+_ZN1KIXadL_ZN1S1mEiEEE1fEv
+K<&S::m>::f()
+K<&S::m>::f
+--format=gnu-v3
+_ZN1KILi1EXadL_ZN1S1mEiEEE1fEv
+K<1, &S::m>::f()
+# Here the `(int)' argument list of `S::m' is already removed.
+--format=gnu-v3
+_ZN1KILi1EXadL_ZN1S1mEEEE1fEv
+K<1, &S::m>::f()
+#
 # Ada (GNAT) tests.
 #
 # Simple test.