1.1 --- a/src/share/vm/opto/connode.hpp Wed May 21 10:45:07 2008 -0700
1.2 +++ b/src/share/vm/opto/connode.hpp Wed May 21 13:46:23 2008 -0700
1.3 @@ -70,11 +70,6 @@
1.4 else
1.5 return new (C, 1) ConPNode( TypeRawPtr::make(con) );
1.6 }
1.7 -
1.8 - static ConPNode* make( Compile *C, ciObject* con ) {
1.9 - return new (C, 1) ConPNode( TypeOopPtr::make_from_constant(con) );
1.10 - }
1.11 -
1.12 };
1.13
1.14
1.15 @@ -84,11 +79,6 @@
1.16 public:
1.17 ConNNode( const TypeNarrowOop *t ) : ConNode(t) {}
1.18 virtual int Opcode() const;
1.19 -
1.20 - static ConNNode* make( Compile *C, ciObject* con ) {
1.21 - return new (C, 1) ConNNode( TypeNarrowOop::make_from_constant(con) );
1.22 - }
1.23 -
1.24 };
1.25
1.26
1.27 @@ -210,7 +200,14 @@
1.28 virtual int Opcode() const;
1.29 };
1.30
1.31 -//------------------------------ConstraintCastNode-------------------------------------
1.32 +//------------------------------CMoveNNode-------------------------------------
1.33 +class CMoveNNode : public CMoveNode {
1.34 +public:
1.35 + CMoveNNode( Node *c, Node *bol, Node *left, Node *right, const Type* t ) : CMoveNode(bol,left,right,t) { init_req(Control,c); }
1.36 + virtual int Opcode() const;
1.37 +};
1.38 +
1.39 +//------------------------------ConstraintCastNode-----------------------------
1.40 // cast to a different range
1.41 class ConstraintCastNode: public TypeNode {
1.42 public:
1.43 @@ -282,7 +279,7 @@
1.44 virtual const Type *Value( PhaseTransform *phase ) const;
1.45 virtual uint ideal_reg() const { return Op_RegN; }
1.46
1.47 - static Node* encode(PhaseGVN* phase, Node* value);
1.48 + static Node* encode(PhaseTransform* phase, Node* value);
1.49 virtual Node *Ideal_DU_postCCP( PhaseCCP *ccp );
1.50 };
1.51
1.52 @@ -302,7 +299,7 @@
1.53 virtual const Type *Value( PhaseTransform *phase ) const;
1.54 virtual uint ideal_reg() const { return Op_RegP; }
1.55
1.56 - static Node* decode(PhaseGVN* phase, Node* value);
1.57 + static Node* decode(PhaseTransform* phase, Node* value);
1.58 };
1.59
1.60 //------------------------------Conv2BNode-------------------------------------
