Commit 38179091 by Jason Merrill Committed by Jason Merrill

PR c++/37376, other mangling issues

gcc/cp/:
        PR c++/37376, other mangling issues
        * mangle.c (write_type): Update TYPE_PACK_EXPANSION mangling.
        (write_member_name): Break out from...
        (write_expression): ...here.  Handle dependent COMPONENT_REF.
        (write_template_arg): Wrap an argument pack in 'I'/'E'.
        (write_builtin_type): Update char16/32_t mangling.
        (write_nested_name, write_prefix): Don't forget template args
        for typename types.
        * operators.def: Add ARROW_EXPR, update COMPONENT_REF and
        EXPR_PACK_EXPANSION.
libstdc++-v3/:
        * config/abi/pre/gnu.ver: Update char16/32_t manglings.
include/:
        * demangle.h (enum demangle_component_type): Add
        DEMANGLE_COMPONENT_PACK_EXPANSION.
libiberty/:
        * cp-demangle.c (struct d_print_info): Add pack_index.
        (d_dump): Add DEMANGLE_COMPONENT_PACK_EXPANSION.
        (d_make_comp): Likewise.  DEMANGLE_COMPONENT_ARGLIST and
        DEMANGLE_COMPONENT_TEMPLATE_ARGLIST can have two null args.
        (cplus_demangle_builtin_types): Add char16/32_t.
        (cplus_demangle_type): Recognize them.
        (d_template_args): Handle empty argument packs.
        (d_template_arg): Handle argument packs.
        (d_expression): Handle dependent name.
        (d_index_template_argument): New fn.
        (d_lookup_template_argument): New fn.
        (d_find_pack, d_pack_length): New fn.
        (d_print_subexpr): Split out...
        (d_print_comp): ...from here.  Use d_*_template_argument.
        Handle empty arg lists.  Support pack expansions.
        * cp-demangle.h (D_BUILTIN_TYPE_COUNT): Increase to 32.

From-SVN: r140916
parent ecbeb53b
2008-10-06 Jason Merrill <jason@redhat.com>
PR c++/37376, other mangling issues
* mangle.c (write_type): Update TYPE_PACK_EXPANSION mangling.
(write_member_name): Break out from...
(write_expression): ...here. Handle dependent COMPONENT_REF.
(write_template_arg): Wrap an argument pack in 'I'/'E'.
(write_builtin_type): Update char16/32_t mangling.
(write_nested_name, write_prefix): Don't forget template args
for typename types.
* operators.def: Add ARROW_EXPR, update COMPONENT_REF and
EXPR_PACK_EXPANSION.
2008-10-06 Aldy Hernandez <aldyh@redhat.com>
* typeck.c (build_x_indirect_ref): Add location argument.
......
......@@ -887,6 +887,20 @@ write_nested_name (const tree decl)
write_template_prefix (decl);
write_template_args (TI_ARGS (template_info));
}
else if (TREE_CODE (TREE_TYPE (decl)) == TYPENAME_TYPE)
{
tree name = TYPENAME_TYPE_FULLNAME (TREE_TYPE (decl));
if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
{
write_template_prefix (decl);
write_template_args (TREE_OPERAND (name, 1));
}
else
{
write_prefix (CP_DECL_CONTEXT (decl));
write_unqualified_name (decl);
}
}
else
{
/* No, just use <prefix> */
......@@ -953,6 +967,20 @@ write_prefix (const tree node)
write_template_prefix (decl);
write_template_args (TI_ARGS (template_info));
}
else if (TREE_CODE (TREE_TYPE (decl)) == TYPENAME_TYPE)
{
tree name = TYPENAME_TYPE_FULLNAME (TREE_TYPE (decl));
if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
{
write_template_prefix (decl);
write_template_args (TREE_OPERAND (name, 1));
}
else
{
write_prefix (CP_DECL_CONTEXT (decl));
write_unqualified_name (decl);
}
}
else
/* Not templated. */
{
......@@ -982,6 +1010,9 @@ write_template_prefix (const tree node)
/* Find the template decl. */
if (decl_is_template_id (decl, &template_info))
templ = TI_TEMPLATE (template_info);
else if (TREE_CODE (type) == TYPENAME_TYPE)
/* For a typename type, all we have is the name. */
templ = DECL_NAME (decl);
else
{
gcc_assert (CLASSTYPE_TEMPLATE_ID_P (type));
......@@ -1020,11 +1051,13 @@ write_template_prefix (const tree node)
return;
/* In G++ 3.2, the name of the template template parameter was used. */
if (TREE_CODE (TREE_TYPE (templ)) == TEMPLATE_TEMPLATE_PARM
if (TREE_TYPE (templ)
&& TREE_CODE (TREE_TYPE (templ)) == TEMPLATE_TEMPLATE_PARM
&& !abi_version_at_least (2))
G.need_abi_warning = true;
if (TREE_CODE (TREE_TYPE (templ)) == TEMPLATE_TEMPLATE_PARM
if (TREE_TYPE (templ)
&& TREE_CODE (TREE_TYPE (templ)) == TEMPLATE_TEMPLATE_PARM
&& abi_version_at_least (2))
write_template_param (TREE_TYPE (templ));
else
......@@ -1636,7 +1669,7 @@ write_type (tree type)
break;
case TYPE_PACK_EXPANSION:
write_string ("U10__variadic");
write_string ("Dp");
write_type (PACK_EXPANSION_PATTERN (type));
break;
......@@ -1750,9 +1783,9 @@ write_builtin_type (tree type)
if (type == wchar_type_node)
write_char ('w');
else if (type == char16_type_node)
write_string ("u8char16_t");
write_string ("Ds");
else if (type == char32_type_node)
write_string ("u8char32_t");
write_string ("Di");
else if (TYPE_FOR_JAVA (type))
write_java_integer_type_codes (type);
else
......@@ -2009,6 +2042,35 @@ write_template_args (tree args)
write_char ('E');
}
/* Write out the
<unqualified-name>
<unqualified-name> <template-args>
part of SCOPE_REF or COMPONENT_REF mangling. */
static void
write_member_name (tree member)
{
if (TREE_CODE (member) == IDENTIFIER_NODE)
write_source_name (member);
else if (DECL_P (member))
{
/* G++ 3.2 incorrectly put out both the "sr" code and
the nested name of the qualified name. */
G.need_abi_warning = 1;
write_unqualified_name (member);
}
else if (TREE_CODE (member) == TEMPLATE_ID_EXPR)
{
tree name = TREE_OPERAND (member, 0);
if (TREE_CODE (name) == OVERLOAD)
name = OVL_FUNCTION (name);
write_member_name (name);
write_template_args (TREE_OPERAND (member, 1));
}
else
write_expression (member);
}
/* <expression> ::= <unary operator-name> <expression>
::= <binary operator-name> <expression> <expression>
::= <expr-primary>
......@@ -2161,6 +2223,20 @@ write_expression (tree expr)
write_template_args (template_args);
}
}
else if (code == COMPONENT_REF)
{
tree ob = TREE_OPERAND (expr, 0);
if (TREE_CODE (ob) == ARROW_EXPR)
{
code = ARROW_EXPR;
ob = TREE_OPERAND (ob, 0);
}
write_string (operator_name_info[(int)code].mangled_name);
write_expression (ob);
write_member_name (TREE_OPERAND (expr, 1));
}
else
{
int i;
......@@ -2198,8 +2274,12 @@ write_expression (tree expr)
case CAST_EXPR:
write_type (TREE_TYPE (expr));
if (!TREE_OPERAND (expr, 0))
/* "T()" is mangled as "T(void)". */
/* "T()" is mangled as "T(void)". */
write_char ('v');
else if (list_length (TREE_OPERAND (expr, 0)) > 1)
/* FIXME the above hack for T() needs to be replaced with
something more general. */
sorry ("mangling function-style cast with more than one argument");
else
write_expression (TREE_VALUE (TREE_OPERAND (expr, 0)));
break;
......@@ -2213,27 +2293,7 @@ write_expression (tree expr)
/* Handle pointers-to-members specially. */
case SCOPE_REF:
write_type (TREE_OPERAND (expr, 0));
if (TREE_CODE (TREE_OPERAND (expr, 1)) == IDENTIFIER_NODE)
write_source_name (TREE_OPERAND (expr, 1));
else if (TREE_CODE (TREE_OPERAND (expr, 1)) == TEMPLATE_ID_EXPR)
{
tree template_id;
tree name;
template_id = TREE_OPERAND (expr, 1);
name = TREE_OPERAND (template_id, 0);
/* FIXME: What about operators? */
gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
write_source_name (TREE_OPERAND (template_id, 0));
write_template_args (TREE_OPERAND (template_id, 1));
}
else
{
/* G++ 3.2 incorrectly put out both the "sr" code and
the nested name of the qualified name. */
G.need_abi_warning = 1;
write_encoding (TREE_OPERAND (expr, 1));
}
write_member_name (TREE_OPERAND (expr, 1));
break;
default:
......@@ -2338,8 +2398,10 @@ write_template_arg (tree node)
/* Expand the template argument pack. */
tree args = ARGUMENT_PACK_ARGS (node);
int i, length = TREE_VEC_LENGTH (args);
write_char ('I');
for (i = 0; i < length; ++i)
write_template_arg (TREE_VEC_ELT (args, i));
write_char ('E');
}
else if (TYPE_P (node))
write_type (node);
......
......@@ -125,7 +125,8 @@ DEF_SIMPLE_OPERATOR ("&&", TRUTH_ANDIF_EXPR, "aa", 2)
DEF_SIMPLE_OPERATOR ("||", TRUTH_ORIF_EXPR, "oo", 2)
DEF_SIMPLE_OPERATOR (",", COMPOUND_EXPR, "cm", 2)
DEF_SIMPLE_OPERATOR ("->*", MEMBER_REF, "pm", 2)
DEF_SIMPLE_OPERATOR ("->", COMPONENT_REF, "pt", 2)
DEF_SIMPLE_OPERATOR ("->", ARROW_EXPR, "pt", 2)
DEF_SIMPLE_OPERATOR (".", COMPONENT_REF, "dt", 2)
DEF_SIMPLE_OPERATOR ("[]", ARRAY_REF, "ix", 2)
DEF_SIMPLE_OPERATOR ("++", POSTINCREMENT_EXPR, "pp", 2)
DEF_SIMPLE_OPERATOR ("--", POSTDECREMENT_EXPR, "mm", 2)
......@@ -152,4 +153,4 @@ DEF_SIMPLE_OPERATOR ("?:", COND_EXPR, "qu", 3)
DEF_SIMPLE_OPERATOR ("()", CALL_EXPR, "cl", -1)
/* Variadic templates extension. */
DEF_SIMPLE_OPERATOR ("...", EXPR_PACK_EXPANSION, "pu", 1)
DEF_SIMPLE_OPERATOR ("...", EXPR_PACK_EXPANSION, "sp", 1)
// Test for mangling of template args in a typename type.
struct A
{
template <class T>
struct B
{
typedef T myT;
};
};
struct C {};
template <class T>
void f (T t, typename T::template B<C>::myT u, typename T::template B<int>::myT v);
int main()
{
f (A(), C(), 1);
}
// { dg-final { scan-assembler "_Z1fI1AEvT_NS1_1BI1CE3myTENS2_IiE3myTE" } }
// Tests for late-specified return type.
// { dg-options "-std=c++0x" }
auto f() -> int
......@@ -12,17 +13,81 @@ auto add(T t, U u) -> decltype (t+u)
}
template<class T, class U>
decltype(T()+U()) add2(T t, U u);
decltype(T()+U()) add2(T t, U u)
{
return t+u;
}
template <class T, class U>
U g (T, U);
U ag (T, U)
{
return U();
}
template<class T, class U>
auto add3(T t, U u) -> decltype (g(t,u));
auto add3(T t, U u) -> decltype (ag(t,u))
{
return ag(t,u);
}
template <class T>
struct A
{
T f() {}
template <class U>
T g() {}
template <class V>
struct B
{
int MEM;
};
};
template <class T>
auto f(T* t) -> decltype (t->f())
{
return t->f();
}
template <class T>
auto g(T t) -> decltype (t.f())
{
return t.f();
}
template <class T, class U>
auto h(T t, U u) -> decltype (t.template g<U>())
{
return t.template g<U>();
}
struct D { };
struct C: public A<int>::B<D>
{
};
template <class T, class U, class V>
auto k(T t, U u, V v) -> decltype (t.U::template B<V>::MEM)
{
return t.U::template B<V>::MEM;
}
A<int> a, *p;
int main()
{
// { dg-final { scan-assembler "_Z3addIidEDTplsTT_sTT0_ES0_S1_" } }
auto i = add(1, 2.0);
// { dg-final { scan-assembler "_Z4add2IidEDTplcvT_vcvT0_vES0_S1_" } }
auto i2 = add2(1, 2.0);
// { dg-final { scan-assembler "_Z4add3IidEDTclL_Z2agEsTT_sTT0_EES0_S1_" } }
auto i3 = add3(1, 2.0);
// { dg-final { scan-assembler "_Z1fI1AIiEEDTclptsTPT_1fEES3_" } }
f(p);
// { dg-final { scan-assembler "_Z1gI1AIiEEDTcldtsTT_1fEES2_" } }
g(a);
// { dg-final { scan-assembler "_Z1hI1AIiEdEDTcldtsTT_1gIT0_EEES2_S3_" } }
h(a,1.0);
// { dg-final { scan-assembler "_Z1kI1C1AIiE1DEDtdtsTT_srNT0_1BIT1_EE3MEMES4_S5_S7_" } }
k( C(), A<int>(), D() );
}
......@@ -9,7 +9,7 @@ void f_two(tuple<int, float>) {}
void f_nested(tuple<int, tuple<double, char>, float>) { }
// { dg-final { scan-assembler "_Z6f_none5tupleIE" } }
// { dg-final { scan-assembler "_Z5f_one5tupleIiE" } }
// { dg-final { scan-assembler "_Z5f_two5tupleIifE" } }
// { dg-final { scan-assembler "_Z8f_nested5tupleIiS_IdcEfE" } }
// { dg-final { scan-assembler "_Z6f_none5tupleIIEE" } }
// { dg-final { scan-assembler "_Z5f_one5tupleIIiEE" } }
// { dg-final { scan-assembler "_Z5f_two5tupleIIifEE" } }
// { dg-final { scan-assembler "_Z8f_nested5tupleIIiS_IIdcEEfEE" } }
......@@ -8,5 +8,5 @@ void g()
f<int*, float*, double*>(0, 0, 0);
f<int*>(0,0,0);
}
// { dg-final { scan-assembler "_Z1fIPiPfPdEvU10__variadicT_" } }
// { dg-final { scan-assembler "_Z1fIPiiiEvU10__variadicT_" } }
// { dg-final { scan-assembler "_Z1fIIPiPfPdEEvDpT_" } }
// { dg-final { scan-assembler "_Z1fIIPiiiEEvDpT_" } }
......@@ -8,7 +8,7 @@ void f1 (char32_t c) {}
void f2 (char16_t *s) {}
void f3 (char32_t *s) {}
// { dg-final { scan-assembler "_Z2f0u8char16_t:" } }
// { dg-final { scan-assembler "_Z2f1u8char32_t:" } }
// { dg-final { scan-assembler "_Z2f2Pu8char16_t:" } }
// { dg-final { scan-assembler "_Z2f3Pu8char32_t:" } }
// { dg-final { scan-assembler "_Z2f0Ds:" } }
// { dg-final { scan-assembler "_Z2f1Di:" } }
// { dg-final { scan-assembler "_Z2f2PDs:" } }
// { dg-final { scan-assembler "_Z2f3PDi:" } }
......@@ -2559,7 +2559,7 @@ struct tree_memory_partition_tag GTY(())
/* For a FUNCTION_DECL, holds the tree of BINDINGs.
For a TRANSLATION_UNIT_DECL, holds the namespace's BLOCK.
For a VAR_DECL, holds the initial value.
For a PARM_DECL, not used--default
For a PARM_DECL, used for DECL_ARG_TYPE--default
values for parameters are encoded in the type of the function,
not in the PARM_DECL slot.
For a FIELD_DECL, this is used for enumeration values and the C
......
2008-10-06 Jason Merrill <jason@redhat.com>
* demangle.h (enum demangle_component_type): Add
DEMANGLE_COMPONENT_PACK_EXPANSION.
2008-09-09 Jason Merrill <jason@redhat.com>
* demangle.h (enum demangle_component_type): Add
......
......@@ -372,7 +372,9 @@ enum demangle_component_type
/* A name formed by a single character. */
DEMANGLE_COMPONENT_CHARACTER,
/* A decltype type. */
DEMANGLE_COMPONENT_DECLTYPE
DEMANGLE_COMPONENT_DECLTYPE,
/* A pack expansion. */
DEMANGLE_COMPONENT_PACK_EXPANSION
};
/* Types which are only used internally. */
......
2008-10-06 Jason Merrill <jason@redhat.com>
* cp-demangle.c (struct d_print_info): Add pack_index.
(d_dump): Add DEMANGLE_COMPONENT_PACK_EXPANSION.
(d_make_comp): Likewise. DEMANGLE_COMPONENT_ARGLIST and
DEMANGLE_COMPONENT_TEMPLATE_ARGLIST can have two null args.
(cplus_demangle_builtin_types): Add char16/32_t.
(cplus_demangle_type): Recognize them.
(d_template_args): Handle empty argument packs.
(d_template_arg): Handle argument packs.
(d_expression): Handle dependent name.
(d_index_template_argument): New fn.
(d_lookup_template_argument): New fn.
(d_find_pack, d_pack_length): New fn.
(d_print_subexpr): Split out...
(d_print_comp): ...from here. Use d_*_template_argument.
Handle empty arg lists. Support pack expansions.
* cp-demangle.h (D_BUILTIN_TYPE_COUNT): Increase to 32.
2008-09-09 Jason Merrill <jason@redhat.com>
* cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_DECLTYPE.
......
......@@ -147,7 +147,7 @@ struct d_info
extern const struct demangle_operator_info cplus_demangle_operators[];
#endif
#define D_BUILTIN_TYPE_COUNT (26)
#define D_BUILTIN_TYPE_COUNT (32)
CP_STATIC_IF_GLIBCPP_V3
const struct demangle_builtin_type_info
......
......@@ -3345,7 +3345,7 @@ f<X>
#
--format=gnu-v3 --no-params
_ZngILi42EEvN1AIXplT_Li2EEE1TE
void operator-<42>(A<(42) + (2)>::T)
void operator-<42>(A<(42)+(2)>::T)
operator-<42>
#
--format=gnu-v3 --no-params
......@@ -3385,7 +3385,7 @@ int* const volatile restrict _far
#
--format=gnu-v3 --no-params
_Z3fooILi2EEvRAplT_Li1E_i
void foo<2>(int (&) [(2) + (1)])
void foo<2>(int (&) [(2)+(1)])
foo<2>
#
--format=gnu-v3 --no-params
......@@ -3612,13 +3612,13 @@ hairyfunc5
# This is from gcc PR 8861
--format=gnu-v3 --no-params
_Z1fILi1ELc120EEv1AIXplT_cviLd810000000000000000703DAD7A370C5EEE
void f<1, (char)120>(A<(1) + ((int)((double)[810000000000000000703DAD7A370C5]))>)
void f<1, (char)120>(A<(1)+((int)((double)[810000000000000000703DAD7A370C5]))>)
f<1, (char)120>
#
# This is also from gcc PR 8861
--format=gnu-v3 --no-params
_Z1fILi1EEv1AIXplT_cvingLf3f800000EEE
void f<1>(A<(1) + ((int)(-((float)[3f800000])))>)
void f<1>(A<(1)+((int)(-((float)[3f800000])))>)
f<1>
#
# This is from a libstdc++ debug mode patch.
......@@ -3643,7 +3643,7 @@ f
# confusion with the '>' which ends the template parameters.
--format=gnu-v3 --no-params
_Z4dep9ILi3EEvP3fooIXgtT_Li2EEE
void dep9<3>(foo<((3) > (2))>*)
void dep9<3>(foo<((3)>(2))>*)
dep9<3>
#
# Watch out for templated version of `operator<'--it needs an extra
......@@ -3885,16 +3885,20 @@ java resource java/util/iso4217.properties
# decltype/param placeholder test
--format=gnu-v3
_Z3addIidEDTplsTT_sTT0_ES0_S1_
decltype ((int) + (double)) add<int, double>(int, double)
# decltype/T() test
--format=gnu-v3
_Z4add2IidEDTplcvT_vcvT0_vES0_S1_
decltype (((int)()) + ((double)())) add2<int, double>(int, double)
decltype ((int)+(double)) add<int, double>(int, double)
# decltype/fn call test
--format=gnu-v3
_Z4add3IidEDTclL_Z1gEsTT_sTT0_EES0_S1_
decltype (g (int, double)) add3<int, double>(int, double)
# Extended floating point types test
decltype (g(int, double)) add3<int, double>(int, double)
# new (2008) built in types test
--format=gnu-v3
_Z1fDfDdDeDhDsDi
f(decimal32, decimal64, decimal128, half, char16_t, char32_t)
# pack expansion test
--format=gnu-v3
_Z1fIIPiPfPdEEvDpT_
void f<int*, float*, double*>(int*, float*, double*)
# '.' test
--format=gnu-v3
_Z1fDfDdDeDh
f(decimal32, decimal64, decimal128, half)
_Z1hI1AIiEdEDTcldtsTT_1gIT0_EEES2_S3_
decltype (((A<int>).(g<double>))()) h<A<int>, double>(A<int>, double)
2008-10-06 Jason Merrill <jason@redhat.com>
* config/abi/pre/gnu.ver: Update char16/32_t manglings.
2008-10-05 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/20_util/reference_wrapper/invoke.cc: New.
......
......@@ -1104,12 +1104,12 @@ CXXABI_1.3.2 {
CXXABI_1.3.3 {
# typeinfo for char16_t and char32_t
_ZTIu8char16_t;
_ZTIPu8char16_t;
_ZTIPKu8char16_t;
_ZTIu8char32_t;
_ZTIPu8char32_t;
_ZTIPKu8char32_t;
_ZTIDs;
_ZTIPDs;
_ZTIPKDs;
_ZTIDi;
_ZTIPDi;
_ZTIPKDi;
# exception_ptr
_ZNSt15__exception_ptr13exception_ptrC1Ev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment