8335552: [8u] JDK-8303466 backport to 8u requires 3 ::Identity signat…

…ure fixes Reviewed-by: mbalao, roland, andrew Backport-of: 8efb3ab7c1cf0164237c50d60c4cd564b3d6a897
openjdk · Jul 3, 2024 · 16ea85b · 16ea85b · openjdk-notifier · Jul 3, 2024
1 parent 54f7734
commit 16ea85b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/hotspot/src/share/vm/opto/addnode.cpp b/hotspot/src/share/vm/opto/addnode.cpp
@@ -1101,7 +1101,7 @@ const Type* MaxLNode::add_ring(const Type* t0, const Type* t1) const {
   return TypeLong::make(MAX2(r0->_lo, r1->_lo), MAX2(r0->_hi, r1->_hi), MAX2(r0->_widen, r1->_widen));
 }
 
-Node* MaxLNode::Identity(PhaseGVN* phase) {
+Node* MaxLNode::Identity(PhaseTransform* phase) {
   const TypeLong* t1 = phase->type(in(1))->is_long();
   const TypeLong* t2 = phase->type(in(2))->is_long();
 
@@ -1133,7 +1133,7 @@ const Type* MinLNode::add_ring(const Type* t0, const Type* t1) const {
   return TypeLong::make(MIN2(r0->_lo, r1->_lo), MIN2(r0->_hi, r1->_hi), MIN2(r0->_widen, r1->_widen));
 }
 
-Node* MinLNode::Identity(PhaseGVN* phase) {
+Node* MinLNode::Identity(PhaseTransform* phase) {
   const TypeLong* t1 = phase->type(in(1))->is_long();
   const TypeLong* t2 = phase->type(in(2))->is_long();
 

diff --git a/hotspot/src/share/vm/opto/addnode.hpp b/hotspot/src/share/vm/opto/addnode.hpp
@@ -292,7 +292,7 @@ class MaxLNode : public MaxNode {
   virtual const Type* add_id() const { return TypeLong::make(min_jlong); }
   virtual const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
-  virtual Node* Identity(PhaseGVN* phase);
+  virtual Node* Identity(PhaseTransform* phase);
   virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
 };
 
@@ -309,7 +309,7 @@ class MinLNode : public MaxNode {
   virtual const Type* add_id() const { return TypeLong::make(max_jlong); }
   virtual const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
-  virtual Node* Identity(PhaseGVN* phase);
+  virtual Node* Identity(PhaseTransform* phase);
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 

diff --git a/hotspot/src/share/vm/opto/connode.cpp b/hotspot/src/share/vm/opto/connode.cpp
@@ -942,7 +942,7 @@ const Type *ConvI2LNode::Value( PhaseTransform *phase ) const {
   return tl;
 }
 
-Node* ConvI2LNode::Identity(PhaseGVN* phase) {
+Node* ConvI2LNode::Identity(PhaseTransform* phase) {
   // If type is in "int" sub-range, we can
   // convert I2L(L2I(x)) => x
   // since the conversions have no effect.

diff --git a/hotspot/src/share/vm/opto/connode.hpp b/hotspot/src/share/vm/opto/connode.hpp
@@ -513,7 +513,7 @@ class ConvI2LNode : public TypeNode {
   virtual int Opcode() const;
   virtual const Type *Value( PhaseTransform *phase ) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
-  virtual Node* Identity(PhaseGVN* phase);
+  virtual Node* Identity(PhaseTransform* phase);
   virtual uint  ideal_reg() const { return Op_RegL; }
 };