Mercurial > hg > graal-jvmci-8
comparison src/share/vm/c1/c1_LIRAssembler.cpp @ 6646:c38f13903fdf
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ just before the NPG (no perm gen) changeset
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 29 Oct 2012 21:10:04 +0100 |
parents | 957c266d8bc5 7a302948f5a4 |
children | e522a00b91aa |
comparison
equal
deleted
inserted
replaced
6590:dc5eec61daba | 6646:c38f13903fdf |
---|---|
447 // emit the static call stub stuff out of line | 447 // emit the static call stub stuff out of line |
448 emit_static_call_stub(); | 448 emit_static_call_stub(); |
449 | 449 |
450 switch (op->code()) { | 450 switch (op->code()) { |
451 case lir_static_call: | 451 case lir_static_call: |
452 case lir_dynamic_call: | |
452 call(op, relocInfo::static_call_type); | 453 call(op, relocInfo::static_call_type); |
453 break; | 454 break; |
454 case lir_optvirtual_call: | 455 case lir_optvirtual_call: |
455 case lir_dynamic_call: | |
456 call(op, relocInfo::opt_virtual_call_type); | 456 call(op, relocInfo::opt_virtual_call_type); |
457 break; | 457 break; |
458 case lir_icvirtual_call: | 458 case lir_icvirtual_call: |
459 ic_call(op); | 459 ic_call(op); |
460 break; | 460 break; |
461 case lir_virtual_call: | 461 case lir_virtual_call: |
462 vtable_call(op); | 462 vtable_call(op); |
463 break; | 463 break; |
464 default: ShouldNotReachHere(); | 464 default: |
465 fatal(err_msg_res("unexpected op code: %s", op->name())); | |
466 break; | |
465 } | 467 } |
466 | 468 |
467 // JSR 292 | 469 // JSR 292 |
468 // Record if this method has MethodHandle invokes. | 470 // Record if this method has MethodHandle invokes. |
469 if (op->is_method_handle_invoke()) { | 471 if (op->is_method_handle_invoke()) { |