Mercurial > hg > release > icedtea-1.9
changeset 1694:9ac931861338
2009-02-20 Gary Benson <gbenson@redhat.com>
* patches/icedtea-cc-interp-backedge.patch: New file.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* HACKING: Document the above.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 03 Mar 2009 21:55:11 +0000 |
| parents | 9f7d3e786d0a |
| children | 9e4c300c4670 |
| files | ChangeLog HACKING Makefile.am patches/icedtea-cc-interp-backedge.patch |
| diffstat | 4 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Mar 03 21:54:03 2009 +0000 +++ b/ChangeLog Tue Mar 03 21:55:11 2009 +0000 @@ -263,6 +263,12 @@ 2009-02-20 Gary Benson <gbenson@redhat.com> + * patches/icedtea-cc-interp-backedge.patch: New file. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * HACKING: Document the above. + +2009-02-20 Gary Benson <gbenson@redhat.com> + * patches/icedtea-zero-build.patch: Make Zero builds say "Zero" in the VM version string as opposed to "Core".
--- a/HACKING Tue Mar 03 21:54:03 2009 +0000 +++ b/HACKING Tue Mar 03 21:55:11 2009 +0000 @@ -73,6 +73,7 @@ * icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo. * icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot. * icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344). +* icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS. * icedtea-includedb.patch: Add missing include files. (S6793825, mostly applied in b47) * icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295).
--- a/Makefile.am Tue Mar 03 21:54:03 2009 +0000 +++ b/Makefile.am Tue Mar 03 21:55:11 2009 +0000 @@ -1860,6 +1860,7 @@ patches/icedtea-java2d-dasher.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ + patches/icedtea-cc-interp-backedge.patch \ $(DISTRIBUTION_PATCHES) if WITH_RHINO
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cc-interp-backedge.patch Tue Mar 03 21:55:11 2009 +0000 @@ -0,0 +1,13 @@ +diff -r e0f4330c215b openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp +--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Feb 20 16:46:08 2009 +0000 ++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Feb 20 17:12:20 2009 +0000 +@@ -296,9 +296,6 @@ + istate->set_osr_entry(osr_nmethod->osr_entry()); \ + return; \ + } \ +- } else { \ +- INCR_INVOCATION_COUNT; \ +- SAFEPOINT; \ + } \ + } /* UseCompiler ... */ \ + INCR_INVOCATION_COUNT; \