Mercurial > hg > release > icedtea6-1.6
changeset 1391:c017a717f617
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 | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Fri, 20 Feb 2009 12:21:56 -0500 |
| parents | c6aff898c0b7 |
| children | c90d22c7678d |
| files | ChangeLog HACKING Makefile.am patches/icedtea-cc-interp-backedge.patch |
| diffstat | 4 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 20 11:39:27 2009 -0500 +++ b/ChangeLog Fri Feb 20 12:21:56 2009 -0500 @@ -1,3 +1,9 @@ +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"
--- a/HACKING Fri Feb 20 11:39:27 2009 -0500 +++ b/HACKING Fri Feb 20 12:21:56 2009 -0500 @@ -83,6 +83,7 @@ * icedtea-includedb.patch: Add missing include files. * icedtea-awt-window-size.patch: Fix X11 window size calculation (S6721088). * 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. The following patches are only applied to OpenJDK6 in IcedTea6:
--- a/Makefile.am Fri Feb 20 11:39:27 2009 -0500 +++ b/Makefile.am Fri Feb 20 12:21:56 2009 -0500 @@ -659,7 +659,8 @@ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-awt-window-size.patch \ patches/icedtea-java2d-dasher.patch \ - patches/hotspot/$(HSBUILD)/icedtea-format.patch + patches/hotspot/$(HSBUILD)/icedtea-format.patch \ + patches/icedtea-cc-interp-backedge.patch stamps/extract.stamp: stamps/download.stamp if OPENJDK_SRC_DIR_FOUND
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cc-interp-backedge.patch Fri Feb 20 12:21:56 2009 -0500 @@ -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; \