archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6939203: JSR 292 needs method handle constants

Browse source 
Add new CP types CONSTANT_MethodHandle, CONSTANT_MethodType; extend 'ldc' bytecode.

Reviewed-by: twisti, never
This commit is contained in:
John R Rose 2010-06-09 18:50:45 -07:00
parent 154ae789ef
commit 1f4cfb029b
60 changed files with 1549 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

38
hotspot/src/share/vm/opto/parse2.cpp
View file

@ -1324,33 +1324,21 @@ void Parse::do_one_bytecode() {
case Bytecodes::_ldc_w:
case Bytecodes::_ldc2_w:
// If the constant is unresolved, run this BC once in the interpreter.
if (iter().is_unresolved_string()) {
uncommon_trap(Deoptimization::make_trap_request
(Deoptimization::Reason_unloaded,
Deoptimization::Action_reinterpret,
iter().get_constant_index()),
NULL, "unresolved_string");
break;
} else {
{
ciConstant constant = iter().get_constant();
if (constant.basic_type() == T_OBJECT) {
ciObject* c = constant.as_object();
if (c->is_klass()) {
// The constant returned for a klass is the ciKlass for the
// entry. We want the java_mirror so get it.
ciKlass* klass = c->as_klass();
if (klass->is_loaded()) {
constant = ciConstant(T_OBJECT, klass->java_mirror());
} else {
uncommon_trap(Deoptimization::make_trap_request
(Deoptimization::Reason_unloaded,
Deoptimization::Action_reinterpret,
iter().get_constant_index()),
NULL, "unresolved_klass");
break;
}
}
if (constant.basic_type() == T_OBJECT &&
!constant.as_object()->is_loaded()) {
int index = iter().get_constant_pool_index();
constantTag tag = iter().get_constant_pool_tag(index);
uncommon_trap(Deoptimization::make_trap_request
(Deoptimization::Reason_unloaded,
Deoptimization::Action_reinterpret,
index),
NULL, tag.internal_name());
break;
}
assert(constant.basic_type() != T_OBJECT || !constant.as_object()->is_klass(),
"must be java_mirror of klass");
bool pushed = push_constant(constant, true);
guarantee(pushed, "must be possible to push this constant");
}