# HG changeset patch # User roland # Date 1346794075 -7200 # Node ID ca11db66f9de1de00414de7b0867c1aeb2559f83 # Parent 46c017102631fcd2fd73c5b1805b4d7807422a31 7184649: NPG: Implement another MetdataPtr case Summary: xmeet when both inputs are MetadataPtr. Reviewed-by: kvn diff -r 46c017102631 -r ca11db66f9de src/share/vm/opto/type.cpp --- a/src/share/vm/opto/type.cpp Tue Sep 04 13:01:03 2012 +0200 +++ b/src/share/vm/opto/type.cpp Tue Sep 04 23:27:55 2012 +0200 @@ -3913,10 +3913,25 @@ case AryPtr: return TypePtr::BOTTOM; // Oop meet raw is not well defined - case MetadataPtr: - ShouldNotReachHere(); + case MetadataPtr: { + const TypeMetadataPtr *tp = t->is_metadataptr(); + int offset = meet_offset(tp->offset()); + PTR tptr = tp->ptr(); + PTR ptr = meet_ptr(tptr); + ciMetadata* md = (tptr == TopPTR) ? metadata() : tp->metadata(); + if (tptr == TopPTR || _ptr == TopPTR || + metadata()->equals(tp->metadata())) { + return make(ptr, md, offset); + } + // metadata is different + if( ptr == Constant ) { // Cannot be equal constants, so... + if( tptr == Constant && _ptr != Constant) return t; + if( _ptr == Constant && tptr != Constant) return this; + ptr = NotNull; // Fall down in lattice + } + return make(ptr, NULL, offset); break; - + } } // End of switch return this; // Return the double constant }