Mercurial > hg > graal-jvmci-8
diff src/share/vm/opto/memnode.cpp @ 1815:5867d89c129b
6982537: Crash in Node*step_through_mergemem
Reviewed-by: kvn
author | never |
---|---|
date | Wed, 22 Sep 2010 13:01:12 -0700 |
parents | 02f0a9b6f654 |
children | 56601ef83436 |
line wrap: on
line diff
--- a/src/share/vm/opto/memnode.cpp Tue Sep 21 13:38:35 2010 -0700 +++ b/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