1.1 --- a/src/share/vm/opto/cfgnode.cpp Tue Jun 24 16:00:14 2008 -0700
1.2 +++ b/src/share/vm/opto/cfgnode.cpp Thu Jun 26 13:34:00 2008 -0700
1.3 @@ -708,12 +708,12 @@
1.4 // Split out an instance type from a bottom phi.
1.5 PhiNode* PhiNode::split_out_instance(const TypePtr* at, PhaseIterGVN *igvn) const {
1.6 const TypeOopPtr *t_oop = at->isa_oopptr();
1.7 - assert(t_oop != NULL && t_oop->is_instance(), "expecting instance oopptr");
1.8 + assert(t_oop != NULL && t_oop->is_known_instance(), "expecting instance oopptr");
1.9 const TypePtr *t = adr_type();
1.10 assert(type() == Type::MEMORY &&
1.11 (t == TypePtr::BOTTOM || t == TypeRawPtr::BOTTOM ||
1.12 - t->isa_oopptr() && !t->is_oopptr()->is_instance() &&
1.13 - t->is_oopptr()->cast_to_instance(t_oop->instance_id()) == t_oop),
1.14 + t->isa_oopptr() && !t->is_oopptr()->is_known_instance() &&
1.15 + t->is_oopptr()->cast_to_instance_id(t_oop->instance_id()) == t_oop),
1.16 "bottom or raw memory required");
1.17
1.18 // Check if an appropriate node already exists.
