jdk-sandbox: comparison hotspot/src/share/vm/c1/c1

equal deleted inserted replaced

-:ef1795cd50a7
+:a34ef8968a84
 }
 }
 CodeEmitInfo* LIRGenerator::state_for(Instruction* x, ValueStack* state, bool ignore_xhandler) {
-int index;
+assert(state != NULL, "state must be defined");
-Value value;
-for_each_stack_value(state, index, value) {
-assert(value->subst() == value, "missed substition");
-if (!value->is_pinned() && value->as_Constant() == NULL && value->as_Local() == NULL) {
-walk(value);
-assert(value->operand()->is_valid(), "must be evaluated now");
-}
-}
 ValueStack* s = state;
-int bci = x->bci();
 for_each_state(s) {
+if (s->kind() == ValueStack::EmptyExceptionState) {
+assert(s->stack_size() == 0 && s->locals_size() == 0 && (s->locks_size() == 0 || s->locks_size() == 1), "state must be empty");
+continue;
+}
+int index;
+Value value;
+for_each_stack_value(s, index, value) {
+assert(value->subst() == value, "missed substitution");
+if (!value->is_pinned() && value->as_Constant() == NULL && value->as_Local() == NULL) {
+walk(value);
+assert(value->operand()->is_valid(), "must be evaluated now");
+}
+}
+int bci = s->bci();
 IRScope* scope = s->scope();
 ciMethod* method = scope->method();
 MethodLivenessResult liveness = method->liveness_at_bci(bci);
 if (bci == SynchronizationEntryBCI) {
 // NULL out this local so that linear scan can assume that all non-NULL values are live.
 s->invalidate_local(index);
 }
 }
 }
-bci = scope->caller_bci();
+}
-}
+return new CodeEmitInfo(state, ignore_xhandler ? NULL : x->exception_handlers());
-return new CodeEmitInfo(x->bci(), state, ignore_xhandler ? NULL : x->exception_handlers());
 }
 CodeEmitInfo* LIRGenerator::state_for(Instruction* x) {
-return state_for(x, x->lock_stack());
+return state_for(x, x->exception_state());
 }
 void LIRGenerator::jobject2reg_with_patching(LIR_Opr r, ciObject* obj, CodeEmitInfo* info) {
 if (!obj->is_loaded() || PatchALot) {
 ValueStack* sux_state = sux->state();
 Value sux_value;
 int index;
+assert(cur_state->scope() == sux_state->scope(), "not matching");
+assert(cur_state->locals_size() == sux_state->locals_size(), "not matching");
+assert(cur_state->stack_size() == sux_state->stack_size(), "not matching");
 for_each_stack_value(sux_state, index, sux_value) {
 move_to_phi(&resolver, cur_state->stack_at(index), sux_value);
-}
-// Inlining may cause the local state not to match up, so walk up
-// the caller state until we get to the same scope as the
-// successor and then start processing from there.
-while (cur_state->scope() != sux_state->scope()) {
-cur_state = cur_state->caller_state();
-assert(cur_state != NULL, "scopes don't match up");
 }
 for_each_local_value(sux_state, index, sux_value) {
 move_to_phi(&resolver, cur_state->local_at(index), sux_value);
 }
 }
 // Code for a constant is generated lazily unless the constant is frequently used and can't be inlined.
 void LIRGenerator::do_Constant(Constant* x) {
-if (x->state() != NULL) {
+if (x->state_before() != NULL) {
 // Any constant with a ValueStack requires patching so emit the patch here
 LIR_Opr reg = rlock_result(x);
-CodeEmitInfo* info = state_for(x, x->state());
+CodeEmitInfo* info = state_for(x, x->state_before());
 __ oop2reg_patch(NULL, reg, info);
 } else if (x->use_count() > 1 && !can_inline_as_constant(x)) {
 if (!x->is_pinned()) {
 // unpinned constants are handled specially so that they can be
 // put into registers when they are used multiple times within a
 LIR_Opr result = rlock_result(x);
 // need to perform the null check on the rcvr
 CodeEmitInfo* info = NULL;
 if (x->needs_null_check()) {
-info = state_for(x, x->state()->copy_locks());
+info = state_for(x);
 }
 __ move(new LIR_Address(rcvr.result(), oopDesc::klass_offset_in_bytes(), T_OBJECT), result, info);
 __ move(new LIR_Address(result, Klass::java_mirror_offset_in_bytes() +
 klassOopDesc::klass_part_offset_in_bytes(), T_OBJECT), result);
 }
 assert(x->explicit_null_check() == NULL, "can't fold null check into patching field access");
 info = state_for(x, x->state_before());
 } else if (x->needs_null_check()) {
 NullCheck* nc = x->explicit_null_check();
 if (nc == NULL) {
-info = state_for(x, x->lock_stack());
+info = state_for(x);
 } else {
 info = state_for(nc);
 }
 }
 value.load_for_store(field_type);
 }
 set_no_result(x);
+#ifndef PRODUCT
 if (PrintNotLoaded && needs_patching) {
 tty->print_cr("   ###class not loaded at store_%s bci %d",
-x->is_static() ?  "static" : "field", x->bci());
+x->is_static() ?  "static" : "field", x->printable_bci());
 }
+#endif
 if (x->needs_null_check() &&
 (needs_patching ||
 MacroAssembler::needs_explicit_null_check(x->offset()))) {
 // emit an explicit null check because the offset is too large
 assert(x->explicit_null_check() == NULL, "can't fold null check into patching field access");
 info = state_for(x, x->state_before());
 } else if (x->needs_null_check()) {
 NullCheck* nc = x->explicit_null_check();
 if (nc == NULL) {
-info = state_for(x, x->lock_stack());
+info = state_for(x);
 } else {
 info = state_for(nc);
 }
 }
 LIRItem object(x->obj(), this);
 object.load_item();
+#ifndef PRODUCT
 if (PrintNotLoaded && needs_patching) {
 tty->print_cr("   ###class not loaded at load_%s bci %d",
-x->is_static() ?  "static" : "field", x->bci());
+x->is_static() ?  "static" : "field", x->printable_bci());
 }
+#endif
 if (x->needs_null_check() &&
 (needs_patching ||
 MacroAssembler::needs_explicit_null_check(x->offset()))) {
 // emit an explicit null check because the offset is too large
 // Use a copy of the CodeEmitInfo because debug information is
 // different for null_check and throw.
 if (GenerateCompilerNullChecks &&
 (x->exception()->as_NewInstance() == NULL && x->exception()->as_ExceptionObject() == NULL)) {
 // if the exception object wasn't created using new then it might be null.
-__ null_check(exception_opr, new CodeEmitInfo(info, true));
+__ null_check(exception_opr, new CodeEmitInfo(info, x->state()->copy(ValueStack::ExceptionState, x->state()->bci())));
 }
 if (compilation()->env()->jvmti_can_post_on_exceptions()) {
 // we need to go through the exception lookup path to get JVMTI
 // notification done
 move_to_phi(x->state());
 int lo_key = x->lo_key();
 int hi_key = x->hi_key();
 int len = x->length();
-CodeEmitInfo* info = state_for(x, x->state());
 LIR_Opr value = tag.result();
 if (UseTableRanges) {
 do_SwitchRanges(create_lookup_ranges(x), value, x->default_sux());
 } else {
 for (int i = 0; i < len; i++) {
 if (x->is_safepoint()) {
 ValueStack* state = x->state_before() ? x->state_before() : x->state();
 // increment backedge counter if needed
 CodeEmitInfo* info = state_for(x, state);
-increment_backedge_counter(info, info->bci());
+increment_backedge_counter(info, info->stack()->bci());
 CodeEmitInfo* safepoint_info = state_for(x, state);
 __ safepoint(safepoint_poll_register(), safepoint_info);
 }
 // Gotos can be folded Ifs, handle this case.
 if (method()->is_synchronized() && GenerateSynchronizationCode) {
 LIR_Opr lock = new_register(T_INT);
 __ load_stack_address_monitor(0, lock);
-CodeEmitInfo* info = new CodeEmitInfo(SynchronizationEntryBCI, scope()->start()->state(), NULL);
+CodeEmitInfo* info = new CodeEmitInfo(scope()->start()->state()->copy(ValueStack::StateBefore, SynchronizationEntryBCI), NULL);
 CodeStub* slow_path = new MonitorEnterStub(obj, lock, info);
 // receiver is guaranteed non-NULL so don't need CodeEmitInfo
 __ lock_object(syncTempOpr(), obj, lock, new_register(T_OBJECT), slow_path, NULL);
 }
 }
 // increment invocation counters if needed
 if (!method()->is_accessor()) { // Accessors do not have MDOs, so no counting.
-CodeEmitInfo* info = new CodeEmitInfo(InvocationEntryBci, scope()->start()->state(), NULL);
+CodeEmitInfo* info = new CodeEmitInfo(scope()->start()->state(), NULL);
 increment_invocation_counter(info);
 }
 // all blocks with a successor must end with an unconditional jump
 // to the successor even if they are consecutive
 __ call_virtual(target, receiver, result_register, vtable_offset, arg_list, info);
 }
 break;
 case Bytecodes::_invokedynamic: {
 ciBytecodeStream bcs(x->scope()->method());
-bcs.force_bci(x->bci());
+bcs.force_bci(x->state()->bci());
 assert(bcs.cur_bc() == Bytecodes::_invokedynamic, "wrong stream");
 ciCPCache* cpcache = bcs.get_cpcache();
 // Get CallSite offset from constant pool cache pointer.
 int index = bcs.get_method_index();

changeset 6745	a34ef8968a84
parent 6742	81ef369b8fc7
child 6751	b399fd234e47