diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-20 16:01:21 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-20 16:01:21 +0000 |
| commit | df6cfbc57139d1afbff073f8791e109f44bf3af6 (patch) | |
| tree | 91b9f4244278d77eb5b23593a3d0f4ca4015ff76 | |
| parent | ddd6fa22c2d9b6e2663ecda709bca66a217943e2 (diff) | |
| download | gcc-df6cfbc57139d1afbff073f8791e109f44bf3af6.tar.gz | |
2009-10-20 Joel Dice <dicej@mailsnare.net>
PR java/28474
* mangle_name.c (append_unicode_mangled_name): Fix mangling
of names with multiple underscores and "U".
(unicode_mangling_length): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153021 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/mangle_name.c | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 6ce9d58b0e0..7815bc8a050 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2009-10-20 Joel Dice <dicej@mailsnare.net> + + PR java/28474 + * mangle_name.c (append_unicode_mangled_name): Fix mangling + of names with multiple underscores and "U". + (unicode_mangling_length): Likewise. + 2009-10-03 Simon Baldwin <simonb@google.com> * config-lang.in (lang_dirs): Remove zlib. diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c index a0e6887a04e..a75f5cad090 100644 --- a/gcc/java/mangle_name.c +++ b/gcc/java/mangle_name.c @@ -266,7 +266,10 @@ append_unicode_mangled_name (const char *name, int len) int ch = UTF8_GET(ptr, limit); if ((ISALNUM (ch) && ch != 'U') || ch == '$') - obstack_1grow (mangle_obstack, ch); + { + obstack_1grow (mangle_obstack, ch); + uuU = 0; + } /* Everything else needs encoding */ else { @@ -321,7 +324,10 @@ unicode_mangling_length (const char *name, int len) if (ch < 0) error ("internal error - invalid Utf8 name"); if ((ISALNUM (ch) && ch != 'U') || ch == '$') - num_chars++; + { + num_chars++; + uuU = 0; + } /* Everything else needs encoding */ else { |