--- old/src/share/vm/opto/convertnode.hpp 2016-07-03 23:42:54.616532790 +0900 +++ new/src/share/vm/opto/convertnode.hpp 2016-07-03 23:42:54.479533359 +0900 @@ -34,7 +34,7 @@ class Conv2BNode : public Node { public: Conv2BNode( Node *i ) : Node(0,i) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return TypeInt::BOOL; } virtual Node* Identity(PhaseGVN* phase); virtual const Type* Value(PhaseGVN* phase) const; @@ -47,7 +47,7 @@ class ConvD2FNode : public Node { public: ConvD2FNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::FLOAT; } virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); @@ -59,7 +59,7 @@ class ConvD2INode : public Node { public: ConvD2INode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return TypeInt::INT; } virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); @@ -72,7 +72,7 @@ class ConvD2LNode : public Node { public: ConvD2LNode( Node *dbl ) : Node(0,dbl) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return TypeLong::LONG; } virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); @@ -85,7 +85,7 @@ class ConvF2DNode : public Node { public: ConvF2DNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual const Type* Value(PhaseGVN* phase) const; virtual uint ideal_reg() const { return Op_RegD; } @@ -96,7 +96,7 @@ class ConvF2INode : public Node { public: ConvF2INode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return TypeInt::INT; } virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); @@ -109,7 +109,7 @@ class ConvF2LNode : public Node { public: ConvF2LNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return TypeLong::LONG; } virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); @@ -122,7 +122,7 @@ class ConvI2DNode : public Node { public: ConvI2DNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual const Type* Value(PhaseGVN* phase) const; virtual uint ideal_reg() const { return Op_RegD; } @@ -133,7 +133,7 @@ class ConvI2FNode : public Node { public: ConvI2FNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::FLOAT; } virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); @@ -147,7 +147,7 @@ ConvI2LNode(Node *in1, const TypeLong* t = TypeLong::INT) : TypeNode(t, 2) { init_req(1, in1); } - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type* Value(PhaseGVN* phase) const; virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); virtual uint ideal_reg() const { return Op_RegL; } @@ -158,7 +158,7 @@ class ConvL2DNode : public Node { public: ConvL2DNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual const Type* Value(PhaseGVN* phase) const; virtual uint ideal_reg() const { return Op_RegD; } @@ -169,7 +169,7 @@ class ConvL2FNode : public Node { public: ConvL2FNode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::FLOAT; } virtual const Type* Value(PhaseGVN* phase) const; virtual uint ideal_reg() const { return Op_RegF; } @@ -180,7 +180,7 @@ class ConvL2INode : public Node { public: ConvL2INode( Node *in1 ) : Node(0,in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return TypeInt::INT; } virtual Node* Identity(PhaseGVN* phase); virtual const Type* Value(PhaseGVN* phase) const; @@ -192,7 +192,7 @@ class RoundFloatNode: public Node { public: RoundFloatNode(Node* c, Node *in1): Node(c, in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::FLOAT; } virtual uint ideal_reg() const { return Op_RegF; } virtual Node* Identity(PhaseGVN* phase); @@ -204,7 +204,7 @@ class RoundDoubleNode: public Node { public: RoundDoubleNode(Node* c, Node *in1): Node(c, in1) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual uint ideal_reg() const { return Op_RegD; } virtual Node* Identity(PhaseGVN* phase);