Mercurial > hg > truffle
comparison src/share/vm/opto/subnode.cpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | 70120f47d403 |
children | c9ccd7b85f20 |
comparison
equal
deleted
inserted
replaced
10086:e0fb8a213650 | 10408:836a62f43af9 |
---|---|
861 const Type *CmpNNode::sub( const Type *t1, const Type *t2 ) const { | 861 const Type *CmpNNode::sub( const Type *t1, const Type *t2 ) const { |
862 const TypePtr *r0 = t1->make_ptr(); // Handy access | 862 const TypePtr *r0 = t1->make_ptr(); // Handy access |
863 const TypePtr *r1 = t2->make_ptr(); | 863 const TypePtr *r1 = t2->make_ptr(); |
864 | 864 |
865 // Undefined inputs makes for an undefined result | 865 // Undefined inputs makes for an undefined result |
866 if( TypePtr::above_centerline(r0->_ptr) || | 866 if ((r0 == NULL) || (r1 == NULL) || |
867 TypePtr::above_centerline(r1->_ptr) ) | 867 TypePtr::above_centerline(r0->_ptr) || |
868 TypePtr::above_centerline(r1->_ptr)) { | |
868 return Type::TOP; | 869 return Type::TOP; |
869 | 870 } |
870 if (r0 == r1 && r0->singleton()) { | 871 if (r0 == r1 && r0->singleton()) { |
871 // Equal pointer constants (klasses, nulls, etc.) | 872 // Equal pointer constants (klasses, nulls, etc.) |
872 return TypeInt::CC_EQ; | 873 return TypeInt::CC_EQ; |
873 } | 874 } |
874 | 875 |