rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-hotspot.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.54, 1.55

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20155

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-hotspot.patch 
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Added hotspot patch (Patch11) to fix eclipse crashing bug.
- Resolves: rhbz#460205



java-1.6.0-openjdk-hotspot.patch:

--- NEW FILE java-1.6.0-openjdk-hotspot.patch ---
--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig	2008-06-08 15:15:19.000000000 +0200
+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-06-08 15:16:06.000000000 +0200
@@ -1551,45 +1551,6 @@
     if (opt != NULL)  return opt;
   }
 
-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
-    // Try to undo Phi of AddP:
-    //   (Phi (AddP base base y) (AddP base2 base2 y))
-    // becomes:
-    //   newbase := (Phi base base2)
-    //   (AddP newbase newbase y)
-    //
-    // This occurs as a result of unsuccessful split_thru_phi and
-    // interferes with taking advantage of addressing modes.  See the
-    // clone_shift_expressions code in matcher.cpp
-    Node* addp = in(1);
-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
-    Node* y = addp->in(AddPNode::Offset);
-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
-      // make sure that all the inputs are similar to the first one,
-      // i.e. AddP with base == address and same offset as first AddP
-      bool doit = true;
-      for (uint i = 2; i < req(); i++) {
-        if (in(i) == NULL ||
-            in(i)->Opcode() != Op_AddP ||
-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
-            in(i)->in(AddPNode::Offset) != y) {
-          doit = false;
-          break;
-        }
-        // Accumulate type for resulting Phi
-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
-      }
-      if (doit) {
-        Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
-        for (uint i = 1; i < req(); i++) {
-          base->init_req(i, in(i)->in(AddPNode::Base));
-        }
-        phase->is_IterGVN()->register_new_node_with_optimizer(base);
-        return new (phase->C, 4) AddPNode(base, base, y);
-      }
-    }
-  }
-
   // Split phis through memory merges, so that the memory merges will go away.
   // Piggy-back this transformation on the search for a unique input....
   // It will be as if the merged memory is the unique value of the phi.


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- java-1.6.0-openjdk.spec	8 Sep 2008 13:03:24 -0000	1.54
+++ java-1.6.0-openjdk.spec	8 Sep 2008 18:09:24 -0000	1.55
@@ -174,6 +174,7 @@
 Patch8:   java-1.6.0-openjdk-6607339.patch
 Patch9:   java-1.6.0-openjdk-6661918.patch
 Patch10:  java-1.6.0-openjdk-6685178.patch
+Patch11:  java-1.6.0-openjdk-hotspot.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -394,6 +395,7 @@
 patch -l -p0 < %{PATCH9}
 %endif
 patch -l -p0 < %{PATCH10}
+patch -l -p0 < %{PATCH11}
 make
 
 # Build cacerts file.
@@ -929,6 +931,10 @@
 
 %changelog
 * Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
+- Added hotspot patch (Patch11) to fix eclipse crashing bug.
+- Resolves: rhbz#460205
+
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
 - Added rhino requirement.
 - Resolves: rhbz#461336