--- a/hotspot/src/share/vm/opto/memnode.cpp Tue Sep 21 13:38:35 2010 -0700
+++ b/hotspot/src/share/vm/opto/memnode.cpp Wed Sep 22 13:01:12 2010 -0700
@@ -193,14 +193,15 @@
}
}
#endif
- // TypeInstPtr::NOTNULL+any is an OOP with unknown offset - generally
+ // TypeOopPtr::NOTNULL+any is an OOP with unknown offset - generally
// means an array I have not precisely typed yet. Do not do any
// alias stuff with it any time soon.
- const TypeOopPtr *tinst = tp->isa_oopptr();
+ const TypeOopPtr *toop = tp->isa_oopptr();
if( tp->base() != Type::AnyPtr &&
- !(tinst &&
- tinst->klass()->is_java_lang_Object() &&
- tinst->offset() == Type::OffsetBot) ) {
+ !(toop &&
+ toop->klass() != NULL &&
+ toop->klass()->is_java_lang_Object() &&
+ toop->offset() == Type::OffsetBot) ) {
// compress paths and change unreachable cycles to TOP
// If not, we can update the input infinitely along a MergeMem cycle
// Equivalent code in PhiNode::Ideal