# HG changeset patch
# User Gary Benson <gbenson@redhat.com>
# Date 1223565922 14400
# Node ID fa94fa7ac782fe494c6c2650872f49e20a8e80b3
# Parent  6790b974078e4ed5339ce86eccd75ab756cf2a25
2008-10-09  Gary Benson  <gbenson@redhat.com>
            Andrew Haley  <aph@redhat.com>

        * patches/icedtea-hotspot-citypeflow.patch: Reinstated.
        * Makefile.am (ZERO_PATCHES): Apply the above for HotSpot 7 builds.

        * ports/hotspot/build/linux/makefiles/shark.make:
        Remove workaround for the above.

diff -r 6790b974078e -r fa94fa7ac782 ChangeLog
--- a/ChangeLog	Thu Oct 09 13:35:37 2008 +0200
+++ b/ChangeLog	Thu Oct 09 11:25:22 2008 -0400
@@ -1,3 +1,12 @@
+2008-10-09  Gary Benson  <gbenson@redhat.com>
+	    Andrew Haley  <aph@redhat.com>
+
+	* patches/icedtea-hotspot-citypeflow.patch: Reinstated.
+	* Makefile.am (ZERO_PATCHES): Apply the above for HotSpot 7 builds.
+
+	* ports/hotspot/build/linux/makefiles/shark.make:
+	Remove workaround for the above.
+
 2008-10-09  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/icedtea-6open-6616825.patch: New.
diff -r 6790b974078e -r fa94fa7ac782 Makefile.am
--- a/Makefile.am	Thu Oct 09 13:35:37 2008 +0200
+++ b/Makefile.am	Thu Oct 09 11:25:22 2008 -0400
@@ -421,7 +421,8 @@
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch
+	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-hotspot-citypeflow.patch
 
 # Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
 NON_ZERO_PATCHES = \
diff -r 6790b974078e -r fa94fa7ac782 patches/icedtea-hotspot-citypeflow.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-hotspot-citypeflow.patch	Thu Oct 09 11:25:22 2008 -0400
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp~	2008-07-10 22:04:30.000000000 +0200
++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp	2008-07-25 14:32:03.544802121 +0200
+@@ -130,7 +130,7 @@
+ 
+   // Used as a combined index for locals and temps
+   enum Cell {
+-    Cell_0
++    Cell_0, Cell_max = UINT_MAX
+   };
+ 
+   // A StateVector summarizes the type information at some
diff -r 6790b974078e -r fa94fa7ac782 ports/hotspot/build/linux/makefiles/shark.make
--- a/ports/hotspot/build/linux/makefiles/shark.make	Thu Oct 09 13:35:37 2008 +0200
+++ b/ports/hotspot/build/linux/makefiles/shark.make	Thu Oct 09 11:25:22 2008 -0400
@@ -30,10 +30,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DSHARK
-
-# Something in this file fails with GCC at higher optimization levels.
-# The part of ciTypeFlow::StateVector::meet_exception() that fills in
-# local variables stops part way through leaving the rest set to T_TOP
-# (ie uninitialized).  The VM then aborts with a ShouldNotReachHere()
-# in SharkPHIState::initialize().  Observed with 4.3.2.
-OPT_CFLAGS/ciTypeFlow.o = -O1