Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Jason Merrill
On Wed, Jan 18, 2017 at 10:32 AM, Markus Trippelsdorf wrote: > On 2017.01.18 at 16:25 +0100, Jakub Jelinek wrote: >> On Wed, Jan 18, 2017 at 04:16:44PM +0100, Markus Trippelsdorf wrote: >> > No. It appears to work even without the additional condition: >> > >> > % g++ -fabi-version=10 -Wabi=11 -W

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Markus Trippelsdorf
On 2017.01.18 at 16:25 +0100, Jakub Jelinek wrote: > On Wed, Jan 18, 2017 at 04:16:44PM +0100, Markus Trippelsdorf wrote: > > No. It appears to work even without the additional condition: > > > > % g++ -fabi-version=10 -Wabi=11 -Wall -c gcc/testsuite/g++.dg/abi/pr77489.C > > gcc/testsuite/g++.dg/

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Jakub Jelinek
On Wed, Jan 18, 2017 at 04:16:44PM +0100, Markus Trippelsdorf wrote: > No. It appears to work even without the additional condition: > > % g++ -fabi-version=10 -Wabi=11 -Wall -c gcc/testsuite/g++.dg/abi/pr77489.C > gcc/testsuite/g++.dg/abi/pr77489.C:56:16: warning: the mangled name of > ‘localVa

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Markus Trippelsdorf
On 2017.01.18 at 10:03 -0500, Jason Merrill wrote: > On Wed, Jan 18, 2017 at 9:23 AM, Markus Trippelsdorf > wrote: > > On 2017.01.18 at 09:11 -0500, Jason Merrill wrote: > >> On Wed, Jan 18, 2017 at 3:55 AM, Markus Trippelsdorf > >> wrote: > >> > On 2017.01.17 at 13:26 -0500, Jason Merrill wrote:

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Jason Merrill
On Wed, Jan 18, 2017 at 9:23 AM, Markus Trippelsdorf wrote: > On 2017.01.18 at 09:11 -0500, Jason Merrill wrote: >> On Wed, Jan 18, 2017 at 3:55 AM, Markus Trippelsdorf >> wrote: >> > On 2017.01.17 at 13:26 -0500, Jason Merrill wrote: >> >> On Thu, Jan 12, 2017 at 2:36 AM, Markus Trippelsdorf >>

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Markus Trippelsdorf
On 2017.01.18 at 09:11 -0500, Jason Merrill wrote: > On Wed, Jan 18, 2017 at 3:55 AM, Markus Trippelsdorf > wrote: > > On 2017.01.17 at 13:26 -0500, Jason Merrill wrote: > >> On Thu, Jan 12, 2017 at 2:36 AM, Markus Trippelsdorf > >> wrote: > > + if (abi_version_at_least (11) && discriminator

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Jason Merrill
On Wed, Jan 18, 2017 at 3:55 AM, Markus Trippelsdorf wrote: > On 2017.01.17 at 13:26 -0500, Jason Merrill wrote: >> On Thu, Jan 12, 2017 at 2:36 AM, Markus Trippelsdorf >> wrote: > + if (abi_version_at_least (11) && discriminator - 1 >= 10) > + { > + write_char ('_'); > +

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Markus Trippelsdorf
On 2017.01.18 at 09:55 +0100, Markus Trippelsdorf wrote: > index cac3d8bc65e9..767c8f42fee9 100644 > --- a/gcc/doc/invoke.texi > +++ b/gcc/doc/invoke.texi > @@ -2252,7 +2252,9 @@ attributes that affect type identity, such as ia32 > calling convention > attributes (e.g. @samp{stdcall}). > > Ver

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-18 Thread Markus Trippelsdorf
On 2017.01.17 at 13:26 -0500, Jason Merrill wrote: > On Thu, Jan 12, 2017 at 2:36 AM, Markus Trippelsdorf > wrote: > > On 2017.01.11 at 13:03 +0100, Jakub Jelinek wrote: > >> On Wed, Jan 11, 2017 at 12:48:29PM +0100, Markus Trippelsdorf wrote: > >> > @@ -1965,7 +1966,11 @@ write_discriminator (con

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-17 Thread Jason Merrill
On Thu, Jan 12, 2017 at 2:36 AM, Markus Trippelsdorf wrote: > On 2017.01.11 at 13:03 +0100, Jakub Jelinek wrote: >> On Wed, Jan 11, 2017 at 12:48:29PM +0100, Markus Trippelsdorf wrote: >> > @@ -1965,7 +1966,11 @@ write_discriminator (const int discriminator) >> >if (discriminator > 0) >> >

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-11 Thread Markus Trippelsdorf
On 2017.01.11 at 13:03 +0100, Jakub Jelinek wrote: > On Wed, Jan 11, 2017 at 12:48:29PM +0100, Markus Trippelsdorf wrote: > > @@ -1965,7 +1966,11 @@ write_discriminator (const int discriminator) > >if (discriminator > 0) > > { > >write_char ('_'); > > + if (abi_version_at_leas

Re: [PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-11 Thread Jakub Jelinek
On Wed, Jan 11, 2017 at 12:48:29PM +0100, Markus Trippelsdorf wrote: > @@ -1965,7 +1966,11 @@ write_discriminator (const int discriminator) >if (discriminator > 0) > { >write_char ('_'); > + if (abi_version_at_least(11) && discriminator - 1 >= 10) > + write_char ('_'); >

[PATCH C++] Fix PR77489 -- mangling of discriminator >= 10

2017-01-11 Thread Markus Trippelsdorf
Currently gcc mangles symbols wrongly when the discriminator is greater than ten. The fix is straightforward. The demangler now handles both the old and the new correct mangling. Tested on ppc64le. OK for trunk? Thanks. libiberty: PR c++/77489 * cp-demangle.c (d_discriminator):