comparison src/share/vm/c1/c1_Canonicalizer.cpp @ 6136:e1635876b206

7174884: C1: failures after 7171890: assert(cur_state != NULL) failed: state_before must be set Reviewed-by: kvn
author twisti
date Wed, 06 Jun 2012 15:57:37 -0700
parents 8f37087fc13f
children 1d7922586cf6
comparison
equal deleted inserted replaced
6135:8f37087fc13f 6136:e1635876b206
464 // ciInstance::java_mirror_type() returns non-NULL only for Java mirrors 464 // ciInstance::java_mirror_type() returns non-NULL only for Java mirrors
465 ciType* t = c->value()->as_instance()->java_mirror_type(); 465 ciType* t = c->value()->as_instance()->java_mirror_type();
466 if (t->is_klass()) { 466 if (t->is_klass()) {
467 // substitute cls.isInstance(obj) of a constant Class into 467 // substitute cls.isInstance(obj) of a constant Class into
468 // an InstantOf instruction 468 // an InstantOf instruction
469 InstanceOf* i = new InstanceOf(t->as_klass(), x->argument_at(1), x->state()); 469 InstanceOf* i = new InstanceOf(t->as_klass(), x->argument_at(1), x->state_before());
470 set_canonical(i); 470 set_canonical(i);
471 // and try to canonicalize even further 471 // and try to canonicalize even further
472 do_InstanceOf(i); 472 do_InstanceOf(i);
473 } else { 473 } else {
474 assert(t->is_primitive_type(), "should be a primitive type"); 474 assert(t->is_primitive_type(), "should be a primitive type");