--- old/src/share/vm/opto/addnode.hpp 2016-07-03 23:42:49.593553666 +0900 +++ new/src/share/vm/opto/addnode.hpp 2016-07-03 23:42:49.444554286 +0900 @@ -75,7 +75,7 @@ class AddINode : public AddNode { public: AddINode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeInt::ZERO; } virtual const Type *bottom_type() const { return TypeInt::INT; } @@ -89,7 +89,7 @@ class AddLNode : public AddNode { public: AddLNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeLong::ZERO; } virtual const Type *bottom_type() const { return TypeLong::LONG; } @@ -103,7 +103,7 @@ class AddFNode : public AddNode { public: AddFNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); virtual const Type *add_of_identity( const Type *t1, const Type *t2 ) const; virtual const Type *add_ring( const Type *, const Type * ) const; @@ -118,7 +118,7 @@ class AddDNode : public AddNode { public: AddDNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); virtual const Type *add_of_identity( const Type *t1, const Type *t2 ) const; virtual const Type *add_ring( const Type *, const Type * ) const; @@ -141,7 +141,7 @@ AddPNode( Node *base, Node *ptr, Node *off ) : Node(0,base,ptr,off) { init_class_id(Class_AddP); } - virtual int Opcode() const; + virtual uint Opcode() const; virtual Node* Identity(PhaseGVN* phase); virtual Node *Ideal(PhaseGVN *phase, bool can_reshape); virtual const Type* Value(PhaseGVN* phase) const; @@ -166,7 +166,7 @@ class OrINode : public AddNode { public: OrINode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeInt::ZERO; } virtual const Type *bottom_type() const { return TypeInt::INT; } @@ -180,7 +180,7 @@ class OrLNode : public AddNode { public: OrLNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeLong::ZERO; } virtual const Type *bottom_type() const { return TypeLong::LONG; } @@ -193,7 +193,7 @@ class XorINode : public AddNode { public: XorINode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeInt::ZERO; } virtual const Type *bottom_type() const { return TypeInt::INT; } @@ -205,7 +205,7 @@ class XorLNode : public AddNode { public: XorLNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeLong::ZERO; } virtual const Type *bottom_type() const { return TypeLong::LONG; } @@ -219,7 +219,7 @@ class MaxNode : public AddNode { public: MaxNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {} - virtual int Opcode() const = 0; + virtual uint Opcode() const = 0; }; //------------------------------MaxINode--------------------------------------- @@ -228,7 +228,7 @@ class MaxINode : public MaxNode { public: MaxINode( Node *in1, Node *in2 ) : MaxNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeInt::make(min_jint); } virtual const Type *bottom_type() const { return TypeInt::INT; } @@ -241,7 +241,7 @@ class MinINode : public MaxNode { public: MinINode( Node *in1, Node *in2 ) : MaxNode(in1,in2) {} - virtual int Opcode() const; + virtual uint Opcode() const; virtual const Type *add_ring( const Type *, const Type * ) const; virtual const Type *add_id() const { return TypeInt::make(max_jint); } virtual const Type *bottom_type() const { return TypeInt::INT; }