Skip to content

Commit 16ea85b

Browse files
franferraxmartinuy
authored andcommitted
8335552: [8u] JDK-8303466 backport to 8u requires 3 ::Identity signature fixes
Reviewed-by: mbalao, roland, andrew Backport-of: 8efb3ab7c1cf0164237c50d60c4cd564b3d6a897
1 parent 54f7734 commit 16ea85b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

hotspot/src/share/vm/opto/addnode.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ const Type* MaxLNode::add_ring(const Type* t0, const Type* t1) const {
11011101
return TypeLong::make(MAX2(r0->_lo, r1->_lo), MAX2(r0->_hi, r1->_hi), MAX2(r0->_widen, r1->_widen));
11021102
}
11031103

1104-
Node* MaxLNode::Identity(PhaseGVN* phase) {
1104+
Node* MaxLNode::Identity(PhaseTransform* phase) {
11051105
const TypeLong* t1 = phase->type(in(1))->is_long();
11061106
const TypeLong* t2 = phase->type(in(2))->is_long();
11071107

@@ -1133,7 +1133,7 @@ const Type* MinLNode::add_ring(const Type* t0, const Type* t1) const {
11331133
return TypeLong::make(MIN2(r0->_lo, r1->_lo), MIN2(r0->_hi, r1->_hi), MIN2(r0->_widen, r1->_widen));
11341134
}
11351135

1136-
Node* MinLNode::Identity(PhaseGVN* phase) {
1136+
Node* MinLNode::Identity(PhaseTransform* phase) {
11371137
const TypeLong* t1 = phase->type(in(1))->is_long();
11381138
const TypeLong* t2 = phase->type(in(2))->is_long();
11391139

hotspot/src/share/vm/opto/addnode.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class MaxLNode : public MaxNode {
292292
virtual const Type* add_id() const { return TypeLong::make(min_jlong); }
293293
virtual const Type* bottom_type() const { return TypeLong::LONG; }
294294
virtual uint ideal_reg() const { return Op_RegL; }
295-
virtual Node* Identity(PhaseGVN* phase);
295+
virtual Node* Identity(PhaseTransform* phase);
296296
virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
297297
};
298298

@@ -309,7 +309,7 @@ class MinLNode : public MaxNode {
309309
virtual const Type* add_id() const { return TypeLong::make(max_jlong); }
310310
virtual const Type* bottom_type() const { return TypeLong::LONG; }
311311
virtual uint ideal_reg() const { return Op_RegL; }
312-
virtual Node* Identity(PhaseGVN* phase);
312+
virtual Node* Identity(PhaseTransform* phase);
313313
virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
314314
};
315315

hotspot/src/share/vm/opto/connode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ const Type *ConvI2LNode::Value( PhaseTransform *phase ) const {
942942
return tl;
943943
}
944944

945-
Node* ConvI2LNode::Identity(PhaseGVN* phase) {
945+
Node* ConvI2LNode::Identity(PhaseTransform* phase) {
946946
// If type is in "int" sub-range, we can
947947
// convert I2L(L2I(x)) => x
948948
// since the conversions have no effect.

hotspot/src/share/vm/opto/connode.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ class ConvI2LNode : public TypeNode {
513513
virtual int Opcode() const;
514514
virtual const Type *Value( PhaseTransform *phase ) const;
515515
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
516-
virtual Node* Identity(PhaseGVN* phase);
516+
virtual Node* Identity(PhaseTransform* phase);
517517
virtual uint ideal_reg() const { return Op_RegL; }
518518
};
519519

0 commit comments

Comments
 (0)