提交 9b9d8cff 编写于 作者: D dsamersoff

Merge

...@@ -63,6 +63,15 @@ void Rewriter::compute_index_maps() { ...@@ -63,6 +63,15 @@ void Rewriter::compute_index_maps() {
_have_invoke_dynamic = ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamic)) != 0); _have_invoke_dynamic = ((tag_mask & (1 << JVM_CONSTANT_InvokeDynamic)) != 0);
} }
// Unrewrite the bytecodes if an error occurs.
void Rewriter::restore_bytecodes() {
int len = _methods->length();
for (int i = len-1; i >= 0; i--) {
methodOop method = (methodOop)_methods->obj_at(i);
scan_method(method, true);
}
}
// Creates a constant pool cache given a CPC map // Creates a constant pool cache given a CPC map
void Rewriter::make_constant_pool_cache(TRAPS) { void Rewriter::make_constant_pool_cache(TRAPS) {
...@@ -133,17 +142,24 @@ void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) { ...@@ -133,17 +142,24 @@ void Rewriter::rewrite_Object_init(methodHandle method, TRAPS) {
// Rewrite a classfile-order CP index into a native-order CPC index. // Rewrite a classfile-order CP index into a native-order CPC index.
void Rewriter::rewrite_member_reference(address bcp, int offset) { void Rewriter::rewrite_member_reference(address bcp, int offset, bool reverse) {
address p = bcp + offset; address p = bcp + offset;
if (!reverse) {
int cp_index = Bytes::get_Java_u2(p); int cp_index = Bytes::get_Java_u2(p);
int cache_index = cp_entry_to_cp_cache(cp_index); int cache_index = cp_entry_to_cp_cache(cp_index);
Bytes::put_native_u2(p, cache_index); Bytes::put_native_u2(p, cache_index);
} else {
int cache_index = Bytes::get_native_u2(p);
int pool_index = cp_cache_entry_pool_index(cache_index);
Bytes::put_Java_u2(p, pool_index);
}
} }
void Rewriter::rewrite_invokedynamic(address bcp, int offset) { void Rewriter::rewrite_invokedynamic(address bcp, int offset, bool reverse) {
address p = bcp + offset; address p = bcp + offset;
assert(p[-1] == Bytecodes::_invokedynamic, ""); assert(p[-1] == Bytecodes::_invokedynamic, "not invokedynamic bytecode");
if (!reverse) {
int cp_index = Bytes::get_Java_u2(p); int cp_index = Bytes::get_Java_u2(p);
int cpc = maybe_add_cp_cache_entry(cp_index); // add lazily int cpc = maybe_add_cp_cache_entry(cp_index); // add lazily
int cpc2 = add_secondary_cp_cache_entry(cpc); int cpc2 = add_secondary_cp_cache_entry(cpc);
...@@ -158,12 +174,24 @@ void Rewriter::rewrite_invokedynamic(address bcp, int offset) { ...@@ -158,12 +174,24 @@ void Rewriter::rewrite_invokedynamic(address bcp, int offset) {
// implementations can use the bytes for other purposes.) // implementations can use the bytes for other purposes.)
Bytes::put_native_u4(p, constantPoolCacheOopDesc::encode_secondary_index(cpc2)); Bytes::put_native_u4(p, constantPoolCacheOopDesc::encode_secondary_index(cpc2));
// Note: We use native_u4 format exclusively for 4-byte indexes. // Note: We use native_u4 format exclusively for 4-byte indexes.
} else {
int cache_index = constantPoolCacheOopDesc::decode_secondary_index(
Bytes::get_native_u4(p));
int secondary_index = cp_cache_secondary_entry_main_index(cache_index);
int pool_index = cp_cache_entry_pool_index(secondary_index);
assert(_pool->tag_at(pool_index).is_invoke_dynamic(), "wrong index");
// zero out 4 bytes
Bytes::put_Java_u4(p, 0);
Bytes::put_Java_u2(p, pool_index);
}
} }
// Rewrite some ldc bytecodes to _fast_aldc // Rewrite some ldc bytecodes to _fast_aldc
void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide) { void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide,
assert((*bcp) == (is_wide ? Bytecodes::_ldc_w : Bytecodes::_ldc), ""); bool reverse) {
if (!reverse) {
assert((*bcp) == (is_wide ? Bytecodes::_ldc_w : Bytecodes::_ldc), "not ldc bytecode");
address p = bcp + offset; address p = bcp + offset;
int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p); int cp_index = is_wide ? Bytes::get_Java_u2(p) : (u1)(*p);
constantTag tag = _pool->tag_at(cp_index).value(); constantTag tag = _pool->tag_at(cp_index).value();
...@@ -171,19 +199,37 @@ void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide) { ...@@ -171,19 +199,37 @@ void Rewriter::maybe_rewrite_ldc(address bcp, int offset, bool is_wide) {
int cache_index = cp_entry_to_cp_cache(cp_index); int cache_index = cp_entry_to_cp_cache(cp_index);
if (is_wide) { if (is_wide) {
(*bcp) = Bytecodes::_fast_aldc_w; (*bcp) = Bytecodes::_fast_aldc_w;
assert(cache_index == (u2)cache_index, ""); assert(cache_index == (u2)cache_index, "index overflow");
Bytes::put_native_u2(p, cache_index); Bytes::put_native_u2(p, cache_index);
} else { } else {
(*bcp) = Bytecodes::_fast_aldc; (*bcp) = Bytecodes::_fast_aldc;
assert(cache_index == (u1)cache_index, ""); assert(cache_index == (u1)cache_index, "index overflow");
(*p) = (u1)cache_index; (*p) = (u1)cache_index;
} }
} }
} else {
Bytecodes::Code rewritten_bc =
(is_wide ? Bytecodes::_fast_aldc_w : Bytecodes::_fast_aldc);
if ((*bcp) == rewritten_bc) {
address p = bcp + offset;
int cache_index = is_wide ? Bytes::get_native_u2(p) : (u1)(*p);
int pool_index = cp_cache_entry_pool_index(cache_index);
if (is_wide) {
(*bcp) = Bytecodes::_ldc_w;
assert(pool_index == (u2)pool_index, "index overflow");
Bytes::put_Java_u2(p, pool_index);
} else {
(*bcp) = Bytecodes::_ldc;
assert(pool_index == (u1)pool_index, "index overflow");
(*p) = (u1)pool_index;
}
}
}
} }
// Rewrites a method given the index_map information // Rewrites a method given the index_map information
void Rewriter::scan_method(methodOop method) { void Rewriter::scan_method(methodOop method, bool reverse) {
int nof_jsrs = 0; int nof_jsrs = 0;
bool has_monitor_bytecodes = false; bool has_monitor_bytecodes = false;
...@@ -233,6 +279,13 @@ void Rewriter::scan_method(methodOop method) { ...@@ -233,6 +279,13 @@ void Rewriter::scan_method(methodOop method) {
? Bytecodes::_fast_linearswitch ? Bytecodes::_fast_linearswitch
: Bytecodes::_fast_binaryswitch : Bytecodes::_fast_binaryswitch
); );
#endif
break;
}
case Bytecodes::_fast_linearswitch:
case Bytecodes::_fast_binaryswitch: {
#ifndef CC_INTERP
(*bcp) = Bytecodes::_lookupswitch;
#endif #endif
break; break;
} }
...@@ -244,16 +297,18 @@ void Rewriter::scan_method(methodOop method) { ...@@ -244,16 +297,18 @@ void Rewriter::scan_method(methodOop method) {
case Bytecodes::_invokespecial : // fall through case Bytecodes::_invokespecial : // fall through
case Bytecodes::_invokestatic : case Bytecodes::_invokestatic :
case Bytecodes::_invokeinterface: case Bytecodes::_invokeinterface:
rewrite_member_reference(bcp, prefix_length+1); rewrite_member_reference(bcp, prefix_length+1, reverse);
break; break;
case Bytecodes::_invokedynamic: case Bytecodes::_invokedynamic:
rewrite_invokedynamic(bcp, prefix_length+1); rewrite_invokedynamic(bcp, prefix_length+1, reverse);
break; break;
case Bytecodes::_ldc: case Bytecodes::_ldc:
maybe_rewrite_ldc(bcp, prefix_length+1, false); case Bytecodes::_fast_aldc:
maybe_rewrite_ldc(bcp, prefix_length+1, false, reverse);
break; break;
case Bytecodes::_ldc_w: case Bytecodes::_ldc_w:
maybe_rewrite_ldc(bcp, prefix_length+1, true); case Bytecodes::_fast_aldc_w:
maybe_rewrite_ldc(bcp, prefix_length+1, true, reverse);
break; break;
case Bytecodes::_jsr : // fall through case Bytecodes::_jsr : // fall through
case Bytecodes::_jsr_w : nof_jsrs++; break; case Bytecodes::_jsr_w : nof_jsrs++; break;
...@@ -273,12 +328,13 @@ void Rewriter::scan_method(methodOop method) { ...@@ -273,12 +328,13 @@ void Rewriter::scan_method(methodOop method) {
if (nof_jsrs > 0) { if (nof_jsrs > 0) {
method->set_has_jsrs(); method->set_has_jsrs();
// Second pass will revisit this method. // Second pass will revisit this method.
assert(method->has_jsrs(), ""); assert(method->has_jsrs(), "didn't we just set this?");
} }
} }
// After constant pool is created, revisit methods containing jsrs. // After constant pool is created, revisit methods containing jsrs.
methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) { methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) {
ResourceMark rm(THREAD);
ResolveOopMapConflicts romc(method); ResolveOopMapConflicts romc(method);
methodHandle original_method = method; methodHandle original_method = method;
method = romc.do_potential_rewrite(CHECK_(methodHandle())); method = romc.do_potential_rewrite(CHECK_(methodHandle()));
...@@ -300,7 +356,6 @@ methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) { ...@@ -300,7 +356,6 @@ methodHandle Rewriter::rewrite_jsrs(methodHandle method, TRAPS) {
return method; return method;
} }
void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) { void Rewriter::rewrite(instanceKlassHandle klass, TRAPS) {
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
Rewriter rw(klass, klass->constants(), klass->methods(), CHECK); Rewriter rw(klass, klass->constants(), klass->methods(), CHECK);
...@@ -343,34 +398,57 @@ Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArray ...@@ -343,34 +398,57 @@ Rewriter::Rewriter(instanceKlassHandle klass, constantPoolHandle cpool, objArray
} }
// rewrite methods, in two passes // rewrite methods, in two passes
int i, len = _methods->length(); int len = _methods->length();
for (i = len; --i >= 0; ) { for (int i = len-1; i >= 0; i--) {
methodOop method = (methodOop)_methods->obj_at(i); methodOop method = (methodOop)_methods->obj_at(i);
scan_method(method); scan_method(method);
} }
// allocate constant pool cache, now that we've seen all the bytecodes // allocate constant pool cache, now that we've seen all the bytecodes
make_constant_pool_cache(CHECK); make_constant_pool_cache(THREAD);
// Restore bytecodes to their unrewritten state if there are exceptions
// rewriting bytecodes or allocating the cpCache
if (HAS_PENDING_EXCEPTION) {
restore_bytecodes();
return;
}
}
// Relocate jsr/rets in a method. This can't be done with the rewriter
// stage because it can throw other exceptions, leaving the bytecodes
// pointing at constant pool cache entries.
// Link and check jvmti dependencies while we're iterating over the methods.
// JSR292 code calls with a different set of methods, so two entry points.
void Rewriter::relocate_and_link(instanceKlassHandle this_oop, TRAPS) {
objArrayHandle methods(THREAD, this_oop->methods());
relocate_and_link(this_oop, methods, THREAD);
}
for (i = len; --i >= 0; ) { void Rewriter::relocate_and_link(instanceKlassHandle this_oop,
methodHandle m(THREAD, (methodOop)_methods->obj_at(i)); objArrayHandle methods, TRAPS) {
int len = methods->length();
for (int i = len-1; i >= 0; i--) {
methodHandle m(THREAD, (methodOop)methods->obj_at(i));
if (m->has_jsrs()) { if (m->has_jsrs()) {
m = rewrite_jsrs(m, CHECK); m = rewrite_jsrs(m, CHECK);
// Method might have gotten rewritten. // Method might have gotten rewritten.
_methods->obj_at_put(i, m()); methods->obj_at_put(i, m());
} }
// Set up method entry points for compiler and interpreter. // Set up method entry points for compiler and interpreter .
m->link_method(m, CHECK); m->link_method(m, CHECK);
// This is for JVMTI and unrelated to relocator but the last thing we do
#ifdef ASSERT #ifdef ASSERT
if (StressMethodComparator) { if (StressMethodComparator) {
static int nmc = 0; static int nmc = 0;
for (int j = i; j >= 0 && j >= i-4; j--) { for (int j = i; j >= 0 && j >= i-4; j--) {
if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc); if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc);
bool z = MethodComparator::methods_EMCP(m(), (methodOop)_methods->obj_at(j)); bool z = MethodComparator::methods_EMCP(m(),
(methodOop)methods->obj_at(j));
if (j == i && !z) { if (j == i && !z) {
tty->print("MethodComparator FAIL: "); m->print(); m->print_codes(); tty->print("MethodComparator FAIL: "); m->print(); m->print_codes();
assert(z, "method must compare equal to itself"); assert(z, "method must compare equal to itself");
......
...@@ -85,13 +85,15 @@ class Rewriter: public StackObj { ...@@ -85,13 +85,15 @@ class Rewriter: public StackObj {
void compute_index_maps(); void compute_index_maps();
void make_constant_pool_cache(TRAPS); void make_constant_pool_cache(TRAPS);
void scan_method(methodOop m); void scan_method(methodOop m, bool reverse = false);
methodHandle rewrite_jsrs(methodHandle m, TRAPS);
void rewrite_Object_init(methodHandle m, TRAPS); void rewrite_Object_init(methodHandle m, TRAPS);
void rewrite_member_reference(address bcp, int offset); void rewrite_member_reference(address bcp, int offset, bool reverse = false);
void rewrite_invokedynamic(address bcp, int offset); void rewrite_invokedynamic(address bcp, int offset, bool reverse = false);
void maybe_rewrite_ldc(address bcp, int offset, bool is_wide); void maybe_rewrite_ldc(address bcp, int offset, bool is_wide, bool reverse = false);
// Revert bytecodes in case of an exception.
void restore_bytecodes();
static methodHandle rewrite_jsrs(methodHandle m, TRAPS);
public: public:
// Driver routine: // Driver routine:
static void rewrite(instanceKlassHandle klass, TRAPS); static void rewrite(instanceKlassHandle klass, TRAPS);
...@@ -100,6 +102,13 @@ class Rewriter: public StackObj { ...@@ -100,6 +102,13 @@ class Rewriter: public StackObj {
enum { enum {
_secondary_entry_tag = nth_bit(30) _secondary_entry_tag = nth_bit(30)
}; };
// Second pass, not gated by is_rewritten flag
static void relocate_and_link(instanceKlassHandle klass, TRAPS);
// JSR292 version to call with it's own methods.
static void relocate_and_link(instanceKlassHandle klass,
objArrayHandle methods, TRAPS);
}; };
#endif // SHARE_VM_INTERPRETER_REWRITER_HPP #endif // SHARE_VM_INTERPRETER_REWRITER_HPP
...@@ -335,6 +335,9 @@ bool instanceKlass::link_class_impl( ...@@ -335,6 +335,9 @@ bool instanceKlass::link_class_impl(
this_oop->rewrite_class(CHECK_false); this_oop->rewrite_class(CHECK_false);
} }
// relocate jsrs and link methods after they are all rewritten
this_oop->relocate_and_link_methods(CHECK_false);
// Initialize the vtable and interface table after // Initialize the vtable and interface table after
// methods have been rewritten since rewrite may // methods have been rewritten since rewrite may
// fabricate new methodOops. // fabricate new methodOops.
...@@ -365,17 +368,8 @@ bool instanceKlass::link_class_impl( ...@@ -365,17 +368,8 @@ bool instanceKlass::link_class_impl(
// Rewrite the byte codes of all of the methods of a class. // Rewrite the byte codes of all of the methods of a class.
// Three cases:
// During the link of a newly loaded class.
// During the preloading of classes to be written to the shared spaces.
// - Rewrite the methods and update the method entry points.
//
// During the link of a class in the shared spaces.
// - The methods were already rewritten, update the metho entry points.
//
// The rewriter must be called exactly once. Rewriting must happen after // The rewriter must be called exactly once. Rewriting must happen after
// verification but before the first method of the class is executed. // verification but before the first method of the class is executed.
void instanceKlass::rewrite_class(TRAPS) { void instanceKlass::rewrite_class(TRAPS) {
assert(is_loaded(), "must be loaded"); assert(is_loaded(), "must be loaded");
instanceKlassHandle this_oop(THREAD, this->as_klassOop()); instanceKlassHandle this_oop(THREAD, this->as_klassOop());
...@@ -383,10 +377,19 @@ void instanceKlass::rewrite_class(TRAPS) { ...@@ -383,10 +377,19 @@ void instanceKlass::rewrite_class(TRAPS) {
assert(this_oop()->is_shared(), "rewriting an unshared class?"); assert(this_oop()->is_shared(), "rewriting an unshared class?");
return; return;
} }
Rewriter::rewrite(this_oop, CHECK); // No exception can happen here Rewriter::rewrite(this_oop, CHECK);
this_oop->set_rewritten(); this_oop->set_rewritten();
} }
// Now relocate and link method entry points after class is rewritten.
// This is outside is_rewritten flag. In case of an exception, it can be
// executed more than once.
void instanceKlass::relocate_and_link_methods(TRAPS) {
assert(is_loaded(), "must be loaded");
instanceKlassHandle this_oop(THREAD, this->as_klassOop());
Rewriter::relocate_and_link(this_oop, CHECK);
}
void instanceKlass::initialize_impl(instanceKlassHandle this_oop, TRAPS) { void instanceKlass::initialize_impl(instanceKlassHandle this_oop, TRAPS) {
// Make sure klass is linked (verified) before initialization // Make sure klass is linked (verified) before initialization
......
...@@ -392,6 +392,7 @@ class instanceKlass: public Klass { ...@@ -392,6 +392,7 @@ class instanceKlass: public Klass {
bool link_class_or_fail(TRAPS); // returns false on failure bool link_class_or_fail(TRAPS); // returns false on failure
void unlink_class(); void unlink_class();
void rewrite_class(TRAPS); void rewrite_class(TRAPS);
void relocate_and_link_methods(TRAPS);
methodOop class_initializer(); methodOop class_initializer();
// set the class to initialized if no static initializer is present // set the class to initialized if no static initializer is present
......
...@@ -693,7 +693,10 @@ void methodOopDesc::unlink_method() { ...@@ -693,7 +693,10 @@ void methodOopDesc::unlink_method() {
// Called when the method_holder is getting linked. Setup entrypoints so the method // Called when the method_holder is getting linked. Setup entrypoints so the method
// is ready to be called from interpreter, compiler, and vtables. // is ready to be called from interpreter, compiler, and vtables.
void methodOopDesc::link_method(methodHandle h_method, TRAPS) { void methodOopDesc::link_method(methodHandle h_method, TRAPS) {
assert(_i2i_entry == NULL, "should only be called once"); // If the code cache is full, we may reenter this function for the
// leftover methods that weren't linked.
if (_i2i_entry != NULL) return;
assert(_adapter == NULL, "init'd to NULL" ); assert(_adapter == NULL, "init'd to NULL" );
assert( _code == NULL, "nothing compiled yet" ); assert( _code == NULL, "nothing compiled yet" );
......
...@@ -992,6 +992,9 @@ jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) { ...@@ -992,6 +992,9 @@ jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {
} }
Rewriter::rewrite(scratch_class, THREAD); Rewriter::rewrite(scratch_class, THREAD);
if (!HAS_PENDING_EXCEPTION) {
Rewriter::relocate_and_link(scratch_class, THREAD);
}
if (HAS_PENDING_EXCEPTION) { if (HAS_PENDING_EXCEPTION) {
Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name(); Symbol* ex_name = PENDING_EXCEPTION->klass()->klass_part()->name();
CLEAR_PENDING_EXCEPTION; CLEAR_PENDING_EXCEPTION;
......
...@@ -1590,6 +1590,7 @@ methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const { ...@@ -1590,6 +1590,7 @@ methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const {
objArrayHandle methods(THREAD, m_array); objArrayHandle methods(THREAD, m_array);
methods->obj_at_put(0, m()); methods->obj_at_put(0, m());
Rewriter::rewrite(_target_klass(), cpool, methods, CHECK_(empty)); // Use fake class. Rewriter::rewrite(_target_klass(), cpool, methods, CHECK_(empty)); // Use fake class.
Rewriter::relocate_and_link(_target_klass(), methods, CHECK_(empty)); // Use fake class.
// Set the invocation counter's count to the invoke count of the // Set the invocation counter's count to the invoke count of the
// original call site. // original call site.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册