1.1 --- a/src/share/vm/c1/c1_Canonicalizer.cpp Wed Sep 22 23:51:03 2010 -0700
1.2 +++ b/src/share/vm/c1/c1_Canonicalizer.cpp Tue Dec 29 19:08:54 2009 +0100
1.3 @@ -205,7 +205,7 @@
1.4 // limit this optimization to current block
1.5 if (value != NULL && in_current_block(conv)) {
1.6 set_canonical(new StoreField(x->obj(), x->offset(), x->field(), value, x->is_static(),
1.7 - x->lock_stack(), x->state_before(), x->is_loaded(), x->is_initialized()));
1.8 + x->state_before(), x->is_loaded(), x->is_initialized()));
1.9 return;
1.10 }
1.11 }
1.12 @@ -256,7 +256,7 @@
1.13 // limit this optimization to current block
1.14 if (value != NULL && in_current_block(conv)) {
1.15 set_canonical(new StoreIndexed(x->array(), x->index(), x->length(),
1.16 - x->elt_type(), value, x->lock_stack()));
1.17 + x->elt_type(), value, x->state_before()));
1.18 return;
1.19 }
1.20 }
1.21 @@ -667,7 +667,7 @@
1.22 }
1.23 }
1.24 set_canonical(canon);
1.25 - set_bci(cmp->bci());
1.26 + set_bci(cmp->state_before()->bci());
1.27 }
1.28 }
1.29 } else if (l->as_InstanceOf() != NULL) {
1.30 @@ -685,7 +685,7 @@
1.31 set_canonical(new Goto(is_inst_sux, x->state_before(), x->is_safepoint()));
1.32 } else {
1.33 // successors differ => simplify to: IfInstanceOf
1.34 - set_canonical(new IfInstanceOf(inst->klass(), inst->obj(), true, inst->bci(), is_inst_sux, no_inst_sux));
1.35 + set_canonical(new IfInstanceOf(inst->klass(), inst->obj(), true, inst->state_before()->bci(), is_inst_sux, no_inst_sux));
1.36 }
1.37 }
1.38 } else if (rt == objectNull && (l->as_NewInstance() || l->as_NewArray())) {
