Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/opto/subnode.cpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/opto/subnode.cpp Wed Jun 19 10:45:56 2013 +0200 @@ -863,10 +863,11 @@ const TypePtr *r1 = t2->make_ptr(); // Undefined inputs makes for an undefined result - if( TypePtr::above_centerline(r0->_ptr) || - TypePtr::above_centerline(r1->_ptr) ) + if ((r0 == NULL) || (r1 == NULL) || + TypePtr::above_centerline(r0->_ptr) || + TypePtr::above_centerline(r1->_ptr)) { return Type::TOP; - + } if (r0 == r1 && r0->singleton()) { // Equal pointer constants (klasses, nulls, etc.) return TypeInt::CC_EQ;