1.1 --- a/src/share/vm/opto/type.cpp Fri Jun 26 16:14:31 2009 -0700
1.2 +++ b/src/share/vm/opto/type.cpp Wed Jul 01 12:22:23 2009 -0700
1.3 @@ -3484,27 +3484,27 @@
1.4 //------------------------------hash-------------------------------------------
1.5 // Type-specific hashing function.
1.6 int TypeNarrowOop::hash(void) const {
1.7 - return _ooptype->hash() + 7;
1.8 + return _ptrtype->hash() + 7;
1.9 }
1.10
1.11
1.12 bool TypeNarrowOop::eq( const Type *t ) const {
1.13 const TypeNarrowOop* tc = t->isa_narrowoop();
1.14 if (tc != NULL) {
1.15 - if (_ooptype->base() != tc->_ooptype->base()) {
1.16 + if (_ptrtype->base() != tc->_ptrtype->base()) {
1.17 return false;
1.18 }
1.19 - return tc->_ooptype->eq(_ooptype);
1.20 + return tc->_ptrtype->eq(_ptrtype);
1.21 }
1.22 return false;
1.23 }
1.24
1.25 bool TypeNarrowOop::singleton(void) const { // TRUE if type is a singleton
1.26 - return _ooptype->singleton();
1.27 + return _ptrtype->singleton();
1.28 }
1.29
1.30 bool TypeNarrowOop::empty(void) const {
1.31 - return _ooptype->empty();
1.32 + return _ptrtype->empty();
1.33 }
1.34
1.35 //------------------------------xmeet------------------------------------------
1.36 @@ -3538,7 +3538,7 @@
1.37 return this;
1.38
1.39 case NarrowOop: {
1.40 - const Type* result = _ooptype->xmeet(t->make_ptr());
1.41 + const Type* result = _ptrtype->xmeet(t->make_ptr());
1.42 if (result->isa_ptr()) {
1.43 return TypeNarrowOop::make(result->is_ptr());
1.44 }
1.45 @@ -3554,13 +3554,13 @@
1.46 }
1.47
1.48 const Type *TypeNarrowOop::xdual() const { // Compute dual right now.
1.49 - const TypePtr* odual = _ooptype->dual()->is_ptr();
1.50 + const TypePtr* odual = _ptrtype->dual()->is_ptr();
1.51 return new TypeNarrowOop(odual);
1.52 }
1.53
1.54 const Type *TypeNarrowOop::filter( const Type *kills ) const {
1.55 if (kills->isa_narrowoop()) {
1.56 - const Type* ft =_ooptype->filter(kills->is_narrowoop()->_ooptype);
1.57 + const Type* ft =_ptrtype->filter(kills->is_narrowoop()->_ptrtype);
1.58 if (ft->empty())
1.59 return Type::TOP; // Canonical empty value
1.60 if (ft->isa_ptr()) {
1.61 @@ -3568,7 +3568,7 @@
1.62 }
1.63 return ft;
1.64 } else if (kills->isa_ptr()) {
1.65 - const Type* ft = _ooptype->join(kills);
1.66 + const Type* ft = _ptrtype->join(kills);
1.67 if (ft->empty())
1.68 return Type::TOP; // Canonical empty value
1.69 return ft;
1.70 @@ -3579,13 +3579,13 @@
1.71
1.72
1.73 intptr_t TypeNarrowOop::get_con() const {
1.74 - return _ooptype->get_con();
1.75 + return _ptrtype->get_con();
1.76 }
1.77
1.78 #ifndef PRODUCT
1.79 void TypeNarrowOop::dump2( Dict & d, uint depth, outputStream *st ) const {
1.80 st->print("narrowoop: ");
1.81 - _ooptype->dump2(d, depth, st);
1.82 + _ptrtype->dump2(d, depth, st);
1.83 }
1.84 #endif
1.85
