diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-01 15:52:45 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-01 15:52:45 +0000 |
| commit | 61ef64167ce0275c52cd71312c85692fdc3702da (patch) | |
| tree | d45776264c7ddfe40e12a61a6bd2555f42877538 /libjava | |
| parent | c0e1af525097b01a93fa2186146366336f9b7f05 (diff) | |
| download | gcc-61ef64167ce0275c52cd71312c85692fdc3702da.tar.gz | |
PR libgcj/21753:
* java/lang/natString.cc (substring): Changed sharing heuristic.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100454 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natString.cc | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ca9f2f45fe1..cddaecbd1d9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-06-01 Tom Tromey <tromey@redhat.com> + + PR libgcj/21753: + * java/lang/natString.cc (substring): Changed sharing heuristic. + 2005-05-30 Bryce McKinlay <mckinlay@redhat.com> PR libgcj/21821 diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index a14f5de9d6e..c8f3129a212 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -833,7 +833,10 @@ java::lang::String::substring (jint beginIndex, jint endIndex) if (beginIndex == 0 && endIndex == count) return this; jint newCount = endIndex - beginIndex; - if (newCount <= 8) // Optimization, mainly for GC. + // For very small strings, just allocate a new one. For other + // substrings, allocate a new one unless the substring is over half + // of the original string. + if (newCount <= 8 || newCount < (count >> 1)) return JvNewString(JvGetStringChars(this) + beginIndex, newCount); jstring s = new String(); s->data = data; |