From 2b472f91ee2e77f6b457d7880c13ed627e9b8666 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Tue, 30 Oct 2001 04:43:16 +0000 Subject: [PATCH] re PR java/4717 (miscompiling class reference) * mangle.c (find_compression_record_match): Don't match compression records for package name elements unless they occur at the start of the name. Fix for PR java/4717. From-SVN: r46628 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/mangle.c | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 7b6b4efa5f2..5049cfd5833 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2001-10-29 Bryce McKinlay + + * mangle.c (find_compression_record_match): Don't match compression + records for package name elements unless they occur at the start of + the name. Fix for PR java/4717. + 2001-10-25 Bryce McKinlay * expr.c (expand_java_field_op): Don't special-case references to diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index f0bda0eaa77..aa95086fc2a 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -327,8 +327,20 @@ find_compression_record_match (type, next_current) { match = i = j; saved_current = current; + i++; break; } + else + { + /* We don't want to match an element that appears in the middle + of a package name, so skip forward to the next complete type name. + IDENTIFIER_NODEs are partial package names while RECORD_TYPEs + represent complete type names. */ + while (j < compression_next + && TREE_CODE (TREE_VEC_ELT (compression_table, j)) == + IDENTIFIER_NODE) + j++; + } } if (!next_current) -- 2.30.2