--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Mon Aug 20 09:58:58 2012 -0700
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Tue Aug 21 10:48:50 2012 -0700
@@ -920,7 +920,8 @@
LIR_Opr LIRGenerator::force_to_spill(LIR_Opr value, BasicType t) {
- assert(type2size[t] == type2size[value->type()], "size mismatch");
+ assert(type2size[t] == type2size[value->type()],
+ err_msg_res("size mismatch: t=%s, value->type()=%s", type2name(t), type2name(value->type())));
if (!value->is_register()) {
// force into a register
LIR_Opr r = new_register(value->type());
@@ -2662,8 +2663,9 @@
void LIRGenerator::invoke_load_arguments(Invoke* x, LIRItemList* args, const LIR_OprList* arg_list) {
- int i = (x->has_receiver() || x->is_invokedynamic()) ? 1 : 0;
- for (; i < args->length(); i++) {
+ assert(args->length() == arg_list->length(),
+ err_msg_res("args=%d, arg_list=%d", args->length(), arg_list->length()));
+ for (int i = x->has_receiver() ? 1 : 0; i < args->length(); i++) {
LIRItem* param = args->at(i);
LIR_Opr loc = arg_list->at(i);
if (loc->is_register()) {
@@ -2703,15 +2705,9 @@
LIRItem* receiver = new LIRItem(x->receiver(), this);
argument_items->append(receiver);
}
- if (x->is_invokedynamic()) {
- // Insert a dummy for the synthetic MethodHandle argument.
- argument_items->append(NULL);
- }
- int idx = x->has_receiver() ? 1 : 0;
for (int i = 0; i < x->number_of_arguments(); i++) {
LIRItem* param = new LIRItem(x->argument_at(i), this);
argument_items->append(param);
- idx += (param->type()->is_double_word() ? 2 : 1);
}
return argument_items;
}
@@ -2756,9 +2752,6 @@
CodeEmitInfo* info = state_for(x, x->state());
- // invokedynamics can deoptimize.
- CodeEmitInfo* deopt_info = x->is_invokedynamic() ? state_for(x, x->state_before()) : NULL;
-
invoke_load_arguments(x, args, arg_list);
if (x->has_receiver()) {
@@ -2807,41 +2800,8 @@
}
break;
case Bytecodes::_invokedynamic: {
- ciBytecodeStream bcs(x->scope()->method());
- 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();
- size_t call_site_offset = cpcache->get_f1_offset(index);
-
- // Load CallSite object from constant pool cache.
- LIR_Opr call_site = new_register(objectType);
- __ oop2reg(cpcache->constant_encoding(), call_site);
- __ move_wide(new LIR_Address(call_site, call_site_offset, T_OBJECT), call_site);
-
- // If this invokedynamic call site hasn't been executed yet in
- // the interpreter, the CallSite object in the constant pool
- // cache is still null and we need to deoptimize.
- if (cpcache->is_f1_null_at(index)) {
- // Only deoptimize if the CallSite object is still null; we don't
- // recompile methods in C1 after deoptimization so this call site
- // might be resolved the next time we execute it after OSR.
- DeoptimizeStub* deopt_stub = new DeoptimizeStub(deopt_info);
- __ cmp(lir_cond_equal, call_site, LIR_OprFact::oopConst(NULL));
- __ branch(lir_cond_equal, T_OBJECT, deopt_stub);
- }
-
- // Use the receiver register for the synthetic MethodHandle
- // argument.
- receiver = LIR_Assembler::receiverOpr();
-
- // Load target MethodHandle from CallSite object.
- __ load(new LIR_Address(call_site, java_lang_invoke_CallSite::target_offset_in_bytes(), T_OBJECT), receiver);
-
__ call_dynamic(target, receiver, result_register,
- SharedRuntime::get_resolve_opt_virtual_call_stub(),
+ SharedRuntime::get_resolve_static_call_stub(),
arg_list, info);
break;
}