--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -365,7 +365,7 @@
return entry;
}
-address CppInterpreter::return_entry(TosState state, int length) {
+address CppInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) {
// make it look good in the debugger
return CAST_FROM_FN_PTR(address, RecursiveInterpreterActivation) + frame::pc_return_offset;
}
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -153,13 +153,9 @@
}
-address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step) {
- TosState incoming_state = state;
+address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
+ address entry = __ pc();
- Label cont;
- address compiled_entry = __ pc();
-
- address entry = __ pc();
#if !defined(_LP64) && defined(COMPILER2)
// All return values are where we want them, except for Longs. C2 returns
// longs in G1 in the 32-bit build whereas the interpreter wants them in O0/O1.
@@ -170,14 +166,12 @@
// do this here. Unfortunately if we did a rethrow we'd see an machepilog node
// first which would move g1 -> O0/O1 and destroy the exception we were throwing.
- if (incoming_state == ltos) {
+ if (state == ltos) {
__ srl (G1, 0, O1);
__ srlx(G1, 32, O0);
}
#endif // !_LP64 && COMPILER2
- __ bind(cont);
-
// The callee returns with the stack possibly adjusted by adapter transition
// We remove that possible adjustment here.
// All interpreter local registers are untouched. Any result is passed back
@@ -186,29 +180,18 @@
__ mov(Llast_SP, SP); // Remove any adapter added stack space.
- Label L_got_cache, L_giant_index;
const Register cache = G3_scratch;
- const Register size = G1_scratch;
- if (EnableInvokeDynamic) {
- __ ldub(Address(Lbcp, 0), G1_scratch); // Load current bytecode.
- __ cmp_and_br_short(G1_scratch, Bytecodes::_invokedynamic, Assembler::equal, Assembler::pn, L_giant_index);
- }
- __ get_cache_and_index_at_bcp(cache, G1_scratch, 1);
- __ bind(L_got_cache);
- __ ld_ptr(cache, ConstantPoolCache::base_offset() +
- ConstantPoolCacheEntry::flags_offset(), size);
- __ and3(size, 0xFF, size); // argument size in words
- __ sll(size, Interpreter::logStackElementSize, size); // each argument size in bytes
- __ add(Lesp, size, Lesp); // pop arguments
+ const Register index = G1_scratch;
+ __ get_cache_and_index_at_bcp(cache, index, 1, index_size);
+
+ const Register flags = cache;
+ __ ld_ptr(cache, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset(), flags);
+ const Register parameter_size = flags;
+ __ and3(flags, ConstantPoolCacheEntry::parameter_size_mask, parameter_size); // argument size in words
+ __ sll(parameter_size, Interpreter::logStackElementSize, parameter_size); // each argument size in bytes
+ __ add(Lesp, parameter_size, Lesp); // pop arguments
__ dispatch_next(state, step);
- // out of the main line of code...
- if (EnableInvokeDynamic) {
- __ bind(L_giant_index);
- __ get_cache_and_index_at_bcp(cache, G1_scratch, 1, sizeof(u4));
- __ ba_short(L_got_cache);
- }
-
return entry;
}
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -2932,9 +2932,7 @@
ConstantPoolCacheEntry::verify_tos_state_shift();
// load return address
{
- const address table_addr = (is_invokeinterface || is_invokedynamic) ?
- (address)Interpreter::return_5_addrs_by_index_table() :
- (address)Interpreter::return_3_addrs_by_index_table();
+ const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
AddressLiteral table(table_addr);
__ set(table, temp);
__ sll(ra, LogBytesPerWord, ra);
@@ -2984,7 +2982,7 @@
__ verify_oop(O0_recv);
// get return address
- AddressLiteral table(Interpreter::return_3_addrs_by_index_table());
+ AddressLiteral table(Interpreter::invoke_return_entry_table());
__ set(table, Rtemp);
__ srl(Rret, ConstantPoolCacheEntry::tos_state_shift, Rret); // get return type
// Make sure we don't need to mask Rret after the above shift
@@ -3026,7 +3024,7 @@
__ profile_final_call(O4);
// get return address
- AddressLiteral table(Interpreter::return_3_addrs_by_index_table());
+ AddressLiteral table(Interpreter::invoke_return_entry_table());
__ set(table, Rtemp);
__ srl(Rret, ConstantPoolCacheEntry::tos_state_shift, Rret); // get return type
// Make sure we don't need to mask Rret after the above shift
--- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -1468,19 +1468,18 @@
addr = new LIR_Address(src.result(), offset, type);
}
- if (data != dst) {
- __ move(data, dst);
- data = dst;
- }
+ // Because we want a 2-arg form of xchg and xadd
+ __ move(data, dst);
+
if (x->is_add()) {
- __ xadd(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr);
+ __ xadd(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
} else {
if (is_obj) {
// Do the pre-write barrier, if any.
pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */,
true /* do_load */, false /* patch */, NULL);
}
- __ xchg(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr);
+ __ xchg(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
if (is_obj) {
// Seems to be a precise address
post_barrier(LIR_OprFact::address(addr), data);
--- a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -367,7 +367,7 @@
return entry;
}
-address CppInterpreter::return_entry(TosState state, int length) {
+address CppInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) {
// make it look good in the debugger
return CAST_FROM_FN_PTR(address, RecursiveInterpreterActivation);
}
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -150,13 +150,12 @@
}
-address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step) {
- TosState incoming_state = state;
+address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
address entry = __ pc();
#ifdef COMPILER2
// The FPU stack is clean if UseSSE >= 2 but must be cleaned in other cases
- if ((incoming_state == ftos && UseSSE < 1) || (incoming_state == dtos && UseSSE < 2)) {
+ if ((state == ftos && UseSSE < 1) || (state == dtos && UseSSE < 2)) {
for (int i = 1; i < 8; i++) {
__ ffree(i);
}
@@ -164,7 +163,7 @@
__ empty_FPU_stack();
}
#endif
- if ((incoming_state == ftos && UseSSE < 1) || (incoming_state == dtos && UseSSE < 2)) {
+ if ((state == ftos && UseSSE < 1) || (state == dtos && UseSSE < 2)) {
__ MacroAssembler::verify_FPU(1, "generate_return_entry_for compiled");
} else {
__ MacroAssembler::verify_FPU(0, "generate_return_entry_for compiled");
@@ -172,12 +171,12 @@
// In SSE mode, interpreter returns FP results in xmm0 but they need
// to end up back on the FPU so it can operate on them.
- if (incoming_state == ftos && UseSSE >= 1) {
+ if (state == ftos && UseSSE >= 1) {
__ subptr(rsp, wordSize);
__ movflt(Address(rsp, 0), xmm0);
__ fld_s(Address(rsp, 0));
__ addptr(rsp, wordSize);
- } else if (incoming_state == dtos && UseSSE >= 2) {
+ } else if (state == dtos && UseSSE >= 2) {
__ subptr(rsp, 2*wordSize);
__ movdbl(Address(rsp, 0), xmm0);
__ fld_d(Address(rsp, 0));
@@ -194,33 +193,22 @@
__ restore_bcp();
__ restore_locals();
- if (incoming_state == atos) {
+ if (state == atos) {
Register mdp = rbx;
Register tmp = rcx;
__ profile_return_type(mdp, rax, tmp);
}
- Label L_got_cache, L_giant_index;
- if (EnableInvokeDynamic) {
- __ cmpb(Address(rsi, 0), Bytecodes::_invokedynamic);
- __ jcc(Assembler::equal, L_giant_index);
- }
- __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u2));
- __ bind(L_got_cache);
- __ movl(rbx, Address(rbx, rcx,
- Address::times_ptr, ConstantPoolCache::base_offset() +
- ConstantPoolCacheEntry::flags_offset()));
- __ andptr(rbx, 0xFF);
- __ lea(rsp, Address(rsp, rbx, Interpreter::stackElementScale()));
+ const Register cache = rbx;
+ const Register index = rcx;
+ __ get_cache_and_index_at_bcp(cache, index, 1, index_size);
+
+ const Register flags = cache;
+ __ movl(flags, Address(cache, index, Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()));
+ __ andl(flags, ConstantPoolCacheEntry::parameter_size_mask);
+ __ lea(rsp, Address(rsp, flags, Interpreter::stackElementScale()));
__ dispatch_next(state, step);
- // out of the main line of code...
- if (EnableInvokeDynamic) {
- __ bind(L_giant_index);
- __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u4));
- __ jmp(L_got_cache);
- }
-
return entry;
}
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -166,7 +166,7 @@
}
-address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step) {
+address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
address entry = __ pc();
// Restore stack bottom in case i2c adjusted stack
@@ -183,28 +183,16 @@
__ profile_return_type(mdp, rax, tmp);
}
- Label L_got_cache, L_giant_index;
- if (EnableInvokeDynamic) {
- __ cmpb(Address(r13, 0), Bytecodes::_invokedynamic);
- __ jcc(Assembler::equal, L_giant_index);
- }
- __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u2));
- __ bind(L_got_cache);
- __ movl(rbx, Address(rbx, rcx,
- Address::times_ptr,
- in_bytes(ConstantPoolCache::base_offset()) +
- 3 * wordSize));
- __ andl(rbx, 0xFF);
- __ lea(rsp, Address(rsp, rbx, Address::times_8));
+ const Register cache = rbx;
+ const Register index = rcx;
+ __ get_cache_and_index_at_bcp(cache, index, 1, index_size);
+
+ const Register flags = cache;
+ __ movl(flags, Address(cache, index, Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()));
+ __ andl(flags, ConstantPoolCacheEntry::parameter_size_mask);
+ __ lea(rsp, Address(rsp, flags, Interpreter::stackElementScale()));
__ dispatch_next(state, step);
- // out of the main line of code...
- if (EnableInvokeDynamic) {
- __ bind(L_giant_index);
- __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u4));
- __ jmp(L_got_cache);
- }
-
return entry;
}
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -2925,9 +2925,7 @@
ConstantPoolCacheEntry::verify_tos_state_shift();
// load return address
{
- const address table_addr = (is_invokeinterface || is_invokedynamic) ?
- (address)Interpreter::return_5_addrs_by_index_table() :
- (address)Interpreter::return_3_addrs_by_index_table();
+ const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
ExternalAddress table(table_addr);
__ movptr(flags, ArrayAddress(table, Address(noreg, flags, Address::times_ptr)));
}
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -2980,9 +2980,7 @@
ConstantPoolCacheEntry::verify_tos_state_shift();
// load return address
{
- const address table_addr = (is_invokeinterface || is_invokedynamic) ?
- (address)Interpreter::return_5_addrs_by_index_table() :
- (address)Interpreter::return_3_addrs_by_index_table();
+ const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
ExternalAddress table(table_addr);
__ lea(rscratch1, table);
__ movptr(flags, Address(rscratch1, flags, Address::times_ptr));
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -1006,7 +1006,7 @@
istate->set_stack_limit(stack_base - method->max_stack() - 1);
}
-address CppInterpreter::return_entry(TosState state, int length) {
+address CppInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) {
ShouldNotCallThis();
return NULL;
}
--- a/hotspot/src/cpu/zero/vm/globals_zero.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -57,6 +57,8 @@
// GC Ergo Flags
define_pd_global(uintx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
+define_pd_global(uintx, TypeProfileLevel, 0);
+
#define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct)
#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -1873,7 +1873,7 @@
// number of implementors for decl_interface is 0 or 1. If
// it's 0 then no class implements decl_interface and there's
// no point in inlining.
- if (!holder->is_loaded() || decl_interface->nof_implementors() != 1) {
+ if (!holder->is_loaded() || decl_interface->nof_implementors() != 1 || decl_interface->has_default_methods()) {
singleton = NULL;
}
}
--- a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/ci/ciInstanceKlass.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -57,6 +57,7 @@
_init_state = ik->init_state();
_nonstatic_field_size = ik->nonstatic_field_size();
_has_nonstatic_fields = ik->has_nonstatic_fields();
+ _has_default_methods = ik->has_default_methods();
_nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields:
_implementor = NULL; // we will fill these lazily
--- a/hotspot/src/share/vm/ci/ciInstanceKlass.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/ci/ciInstanceKlass.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -52,6 +52,7 @@
bool _has_finalizer;
bool _has_subklass;
bool _has_nonstatic_fields;
+ bool _has_default_methods;
ciFlags _flags;
jint _nonstatic_field_size;
@@ -171,6 +172,11 @@
}
}
+ bool has_default_methods() {
+ assert(is_loaded(), "must be loaded");
+ return _has_default_methods;
+ }
+
ciInstanceKlass* get_canonical_holder(int offset);
ciField* get_field_by_offset(int field_offset, bool is_static);
ciField* get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static);
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -780,6 +780,10 @@
void CompileBroker::compilation_init() {
_last_method_compiled[0] = '\0';
+ // No need to initialize compilation system if we do not use it.
+ if (!UseCompiler) {
+ return;
+ }
#ifndef SHARK
// Set the interface to the current compiler(s).
int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple);
--- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -158,8 +158,8 @@
// Runtime support
// length = invoke bytecode length (to advance to next bytecode)
- static address deopt_entry (TosState state, int length) { ShouldNotReachHere(); return NULL; }
- static address return_entry (TosState state, int length) { ShouldNotReachHere(); return NULL; }
+ static address deopt_entry(TosState state, int length) { ShouldNotReachHere(); return NULL; }
+ static address return_entry(TosState state, int length, Bytecodes::Code code) { ShouldNotReachHere(); return NULL; }
static address rethrow_exception_entry() { return _rethrow_exception_entry; }
--- a/hotspot/src/share/vm/interpreter/cppInterpreter.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/interpreter/cppInterpreter.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -78,7 +78,7 @@
static address stack_result_to_stack(int index) { return _stack_to_stack[index]; }
static address stack_result_to_native(int index) { return _stack_to_native_abi[index]; }
- static address return_entry (TosState state, int length);
+ static address return_entry (TosState state, int length, Bytecodes::Code code);
static address deopt_entry (TosState state, int length);
#ifdef TARGET_ARCH_x86
--- a/hotspot/src/share/vm/interpreter/interpreter.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/interpreter/interpreter.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -329,15 +329,21 @@
//------------------------------------------------------------------------------------------------------------------------
// Deoptimization support
-// If deoptimization happens, this function returns the point of next bytecode to continue execution
+/**
+ * If a deoptimization happens, this function returns the point of next bytecode to continue execution.
+ */
address AbstractInterpreter::deopt_continue_after_entry(Method* method, address bcp, int callee_parameters, bool is_top_frame) {
assert(method->contains(bcp), "just checkin'");
- Bytecodes::Code code = Bytecodes::java_code_at(method, bcp);
+
+ // Get the original and rewritten bytecode.
+ Bytecodes::Code code = Bytecodes::java_code_at(method, bcp);
assert(!Interpreter::bytecode_should_reexecute(code), "should not reexecute");
- int bci = method->bci_from(bcp);
- int length = -1; // initial value for debugging
+
+ const int bci = method->bci_from(bcp);
+
// compute continuation length
- length = Bytecodes::length_at(method, bcp);
+ const int length = Bytecodes::length_at(method, bcp);
+
// compute result type
BasicType type = T_ILLEGAL;
@@ -393,7 +399,7 @@
return
is_top_frame
? Interpreter::deopt_entry (as_TosState(type), length)
- : Interpreter::return_entry(as_TosState(type), length);
+ : Interpreter::return_entry(as_TosState(type), length, code);
}
// If deoptimization happens, this function returns the point where the interpreter reexecutes
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -184,8 +184,9 @@
EntryPoint TemplateInterpreter::_continuation_entry;
EntryPoint TemplateInterpreter::_safept_entry;
-address TemplateInterpreter::_return_3_addrs_by_index[TemplateInterpreter::number_of_return_addrs];
-address TemplateInterpreter::_return_5_addrs_by_index[TemplateInterpreter::number_of_return_addrs];
+address TemplateInterpreter::_invoke_return_entry[TemplateInterpreter::number_of_return_addrs];
+address TemplateInterpreter::_invokeinterface_return_entry[TemplateInterpreter::number_of_return_addrs];
+address TemplateInterpreter::_invokedynamic_return_entry[TemplateInterpreter::number_of_return_addrs];
DispatchTable TemplateInterpreter::_active_table;
DispatchTable TemplateInterpreter::_normal_table;
@@ -237,22 +238,37 @@
#endif // !PRODUCT
{ CodeletMark cm(_masm, "return entry points");
+ const int index_size = sizeof(u2);
for (int i = 0; i < Interpreter::number_of_return_entries; i++) {
Interpreter::_return_entry[i] =
EntryPoint(
- generate_return_entry_for(itos, i),
- generate_return_entry_for(itos, i),
- generate_return_entry_for(itos, i),
- generate_return_entry_for(atos, i),
- generate_return_entry_for(itos, i),
- generate_return_entry_for(ltos, i),
- generate_return_entry_for(ftos, i),
- generate_return_entry_for(dtos, i),
- generate_return_entry_for(vtos, i)
+ generate_return_entry_for(itos, i, index_size),
+ generate_return_entry_for(itos, i, index_size),
+ generate_return_entry_for(itos, i, index_size),
+ generate_return_entry_for(atos, i, index_size),
+ generate_return_entry_for(itos, i, index_size),
+ generate_return_entry_for(ltos, i, index_size),
+ generate_return_entry_for(ftos, i, index_size),
+ generate_return_entry_for(dtos, i, index_size),
+ generate_return_entry_for(vtos, i, index_size)
);
}
}
+ { CodeletMark cm(_masm, "invoke return entry points");
+ const TosState states[] = {itos, itos, itos, itos, ltos, ftos, dtos, atos, vtos};
+ const int invoke_length = Bytecodes::length_for(Bytecodes::_invokestatic);
+ const int invokeinterface_length = Bytecodes::length_for(Bytecodes::_invokeinterface);
+ const int invokedynamic_length = Bytecodes::length_for(Bytecodes::_invokedynamic);
+
+ for (int i = 0; i < Interpreter::number_of_return_addrs; i++) {
+ TosState state = states[i];
+ Interpreter::_invoke_return_entry[i] = generate_return_entry_for(state, invoke_length, sizeof(u2));
+ Interpreter::_invokeinterface_return_entry[i] = generate_return_entry_for(state, invokeinterface_length, sizeof(u2));
+ Interpreter::_invokedynamic_return_entry[i] = generate_return_entry_for(state, invokedynamic_length, sizeof(u4));
+ }
+ }
+
{ CodeletMark cm(_masm, "earlyret entry points");
Interpreter::_earlyret_entry =
EntryPoint(
@@ -298,13 +314,6 @@
}
}
- for (int j = 0; j < number_of_states; j++) {
- const TosState states[] = {btos, ctos, stos, itos, ltos, ftos, dtos, atos, vtos};
- int index = Interpreter::TosState_as_index(states[j]);
- Interpreter::_return_3_addrs_by_index[index] = Interpreter::return_entry(states[j], 3);
- Interpreter::_return_5_addrs_by_index[index] = Interpreter::return_entry(states[j], 5);
- }
-
{ CodeletMark cm(_masm, "continuation entry points");
Interpreter::_continuation_entry =
EntryPoint(
@@ -534,9 +543,46 @@
//------------------------------------------------------------------------------------------------------------------------
// Entry points
-address TemplateInterpreter::return_entry(TosState state, int length) {
+/**
+ * Returns the return entry table for the given invoke bytecode.
+ */
+address* TemplateInterpreter::invoke_return_entry_table_for(Bytecodes::Code code) {
+ switch (code) {
+ case Bytecodes::_invokestatic:
+ case Bytecodes::_invokespecial:
+ case Bytecodes::_invokevirtual:
+ case Bytecodes::_invokehandle:
+ return Interpreter::invoke_return_entry_table();
+ case Bytecodes::_invokeinterface:
+ return Interpreter::invokeinterface_return_entry_table();
+ case Bytecodes::_invokedynamic:
+ return Interpreter::invokedynamic_return_entry_table();
+ default:
+ fatal(err_msg("invalid bytecode: %s", Bytecodes::name(code)));
+ return NULL;
+ }
+}
+
+/**
+ * Returns the return entry address for the given top-of-stack state and bytecode.
+ */
+address TemplateInterpreter::return_entry(TosState state, int length, Bytecodes::Code code) {
guarantee(0 <= length && length < Interpreter::number_of_return_entries, "illegal length");
- return _return_entry[length].entry(state);
+ const int index = TosState_as_index(state);
+ switch (code) {
+ case Bytecodes::_invokestatic:
+ case Bytecodes::_invokespecial:
+ case Bytecodes::_invokevirtual:
+ case Bytecodes::_invokehandle:
+ return _invoke_return_entry[index];
+ case Bytecodes::_invokeinterface:
+ return _invokeinterface_return_entry[index];
+ case Bytecodes::_invokedynamic:
+ return _invokedynamic_return_entry[index];
+ default:
+ assert(!Bytecodes::is_invoke(code), err_msg("invoke instructions should be handled separately: %s", Bytecodes::name(code)));
+ return _return_entry[length].entry(state);
+ }
}
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -120,8 +120,9 @@
static EntryPoint _continuation_entry;
static EntryPoint _safept_entry;
- static address _return_3_addrs_by_index[number_of_return_addrs]; // for invokevirtual return entries
- static address _return_5_addrs_by_index[number_of_return_addrs]; // for invokeinterface return entries
+ static address _invoke_return_entry[number_of_return_addrs]; // for invokestatic, invokespecial, invokevirtual return entries
+ static address _invokeinterface_return_entry[number_of_return_addrs]; // for invokeinterface return entries
+ static address _invokedynamic_return_entry[number_of_return_addrs]; // for invokedynamic return entries
static DispatchTable _active_table; // the active dispatch table (used by the interpreter for dispatch)
static DispatchTable _normal_table; // the normal dispatch table (used to set the active table in normal mode)
@@ -161,12 +162,15 @@
static address* normal_table() { return _normal_table.table_for(); }
// Support for invokes
- static address* return_3_addrs_by_index_table() { return _return_3_addrs_by_index; }
- static address* return_5_addrs_by_index_table() { return _return_5_addrs_by_index; }
- static int TosState_as_index(TosState state); // computes index into return_3_entry_by_index table
+ static address* invoke_return_entry_table() { return _invoke_return_entry; }
+ static address* invokeinterface_return_entry_table() { return _invokeinterface_return_entry; }
+ static address* invokedynamic_return_entry_table() { return _invokedynamic_return_entry; }
+ static int TosState_as_index(TosState state);
- static address return_entry (TosState state, int length);
- static address deopt_entry (TosState state, int length);
+ static address* invoke_return_entry_table_for(Bytecodes::Code code);
+
+ static address deopt_entry(TosState state, int length);
+ static address return_entry(TosState state, int length, Bytecodes::Code code);
// Safepoint support
static void notice_safepoints(); // stops the thread when reaching a safepoint
--- a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -53,7 +53,7 @@
address generate_ClassCastException_handler();
address generate_ArrayIndexOutOfBounds_handler(const char* name);
address generate_continuation_for(TosState state);
- address generate_return_entry_for(TosState state, int step);
+ address generate_return_entry_for(TosState state, int step, size_t index_size);
address generate_earlyret_entry_for(TosState state);
address generate_deopt_entry_for(TosState state, int step);
address generate_safept_entry_for(TosState state, address runtime_entry);
--- a/hotspot/src/share/vm/oops/method.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/oops/method.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -1515,7 +1515,10 @@
return bp->orig_bytecode();
}
}
- ShouldNotReachHere();
+ {
+ ResourceMark rm;
+ fatal(err_msg("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci));
+ }
return Bytecodes::_shouldnotreachhere;
}
--- a/hotspot/src/share/vm/opto/library_call.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/opto/library_call.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -2006,9 +2006,9 @@
Node* arg2 = NULL;
if (is_increment) {
- arg2 = intcon(1);
+ arg2 = intcon(1);
} else {
- arg2 = argument(1);
+ arg2 = argument(1);
}
Node* add = _gvn.transform( new(C) AddExactINode(NULL, arg1, arg2) );
@@ -2056,7 +2056,7 @@
if (is_decrement) {
arg2 = longcon(1);
} else {
- Node* arg2 = argument(2); // type long
+ arg2 = argument(2); // type long
// argument(3) == TOP
}
--- a/hotspot/src/share/vm/opto/loopTransform.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -713,6 +713,10 @@
case Op_ModL: body_size += 30; break;
case Op_DivL: body_size += 30; break;
case Op_MulL: body_size += 10; break;
+ case Op_FlagsProj:
+ // Can't handle unrolling of loops containing
+ // nodes that generate a FlagsProj at the moment
+ return false;
case Op_StrComp:
case Op_StrEquals:
case Op_StrIndexOf:
--- a/hotspot/src/share/vm/opto/postaloc.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/opto/postaloc.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -97,7 +97,8 @@
static bool expected_yanked_node(Node *old, Node *orig_old) {
// This code is expected only next original nodes:
// - load from constant table node which may have next data input nodes:
- // MachConstantBase, Phi, MachTemp, MachSpillCopy
+ // MachConstantBase, MachTemp, MachSpillCopy
+ // - Phi nodes that are considered Junk
// - load constant node which may have next data input nodes:
// MachTemp, MachSpillCopy
// - MachSpillCopy
@@ -112,7 +113,9 @@
return (old == orig_old);
} else if (old->is_MachTemp()) {
return orig_old->is_Con();
- } else if (old->is_Phi() || old->is_MachConstantBase()) {
+ } else if (old->is_Phi()) { // Junk phi's
+ return true;
+ } else if (old->is_MachConstantBase()) {
return (orig_old->is_Con() && orig_old->is_MachConstant());
}
return false;
@@ -522,11 +525,9 @@
u = u ? NodeSentinel : x; // Capture unique input, or NodeSentinel for 2nd input
}
if (u != NodeSentinel) { // Junk Phi. Remove
- block->remove_node(j--);
+ phi->replace_by(u);
+ j -= yank_if_dead(phi, block, &value, ®nd);
phi_dex--;
- _cfg.unmap_node_from_block(phi);
- phi->replace_by(u);
- phi->disconnect_inputs(NULL, C);
continue;
}
// Note that if value[pidx] exists, then we merged no new values here
--- a/hotspot/src/share/vm/opto/type.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/opto/type.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -2787,13 +2787,11 @@
//-----------------------------filter------------------------------------------
// Do not allow interface-vs.-noninterface joins to collapse to top.
-const Type *TypeOopPtr::filter( const Type *kills ) const {
+const Type *TypeOopPtr::filter(const Type *kills) const {
const Type* ft = join(kills);
const TypeInstPtr* ftip = ft->isa_instptr();
const TypeInstPtr* ktip = kills->isa_instptr();
- const TypeKlassPtr* ftkp = ft->isa_klassptr();
- const TypeKlassPtr* ktkp = kills->isa_klassptr();
if (ft->empty()) {
// Check for evil case of 'this' being a class and 'kills' expecting an
@@ -2807,8 +2805,6 @@
// uplift the type.
if (!empty() && ktip != NULL && ktip->is_loaded() && ktip->klass()->is_interface())
return kills; // Uplift to interface
- if (!empty() && ktkp != NULL && ktkp->klass()->is_loaded() && ktkp->klass()->is_interface())
- return kills; // Uplift to interface
return Type::TOP; // Canonical empty value
}
@@ -2825,14 +2821,6 @@
assert(!ftip->klass_is_exact(), "interface could not be exact");
return ktip->cast_to_ptr_type(ftip->ptr());
}
- // Interface klass type could be exact in opposite to interface type,
- // return it here instead of incorrect Constant ptr J/L/Object (6894807).
- if (ftkp != NULL && ktkp != NULL &&
- ftkp->is_loaded() && ftkp->klass()->is_interface() &&
- !ftkp->klass_is_exact() && // Keep exact interface klass
- ktkp->is_loaded() && !ktkp->klass()->is_interface()) {
- return ktkp->cast_to_ptr_type(ftkp->ptr());
- }
return ft;
}
@@ -4385,6 +4373,33 @@
return (_offset == 0) && !below_centerline(_ptr);
}
+// Do not allow interface-vs.-noninterface joins to collapse to top.
+const Type *TypeKlassPtr::filter(const Type *kills) const {
+ // logic here mirrors the one from TypeOopPtr::filter. See comments
+ // there.
+ const Type* ft = join(kills);
+ const TypeKlassPtr* ftkp = ft->isa_klassptr();
+ const TypeKlassPtr* ktkp = kills->isa_klassptr();
+
+ if (ft->empty()) {
+ if (!empty() && ktkp != NULL && ktkp->klass()->is_loaded() && ktkp->klass()->is_interface())
+ return kills; // Uplift to interface
+
+ return Type::TOP; // Canonical empty value
+ }
+
+ // Interface klass type could be exact in opposite to interface type,
+ // return it here instead of incorrect Constant ptr J/L/Object (6894807).
+ if (ftkp != NULL && ktkp != NULL &&
+ ftkp->is_loaded() && ftkp->klass()->is_interface() &&
+ !ftkp->klass_is_exact() && // Keep exact interface klass
+ ktkp->is_loaded() && !ktkp->klass()->is_interface()) {
+ return ktkp->cast_to_ptr_type(ftkp->ptr());
+ }
+
+ return ft;
+}
+
//----------------------compute_klass------------------------------------------
// Compute the defining klass for this class
ciKlass* TypeAryPtr::compute_klass(DEBUG_ONLY(bool verify)) const {
--- a/hotspot/src/share/vm/opto/type.hpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/opto/type.hpp Thu Oct 31 14:54:14 2013 -0700
@@ -63,7 +63,7 @@
class TypeOopPtr;
class TypeInstPtr;
class TypeAryPtr;
-class TypeKlassPtr;
+class TypeKlassPtr;
class TypeMetadataPtr;
//------------------------------Type-------------------------------------------
@@ -1202,6 +1202,9 @@
virtual intptr_t get_con() const;
+ // Do not allow interface-vs.-noninterface joins to collapse to top.
+ virtual const Type *filter( const Type *kills ) const;
+
// Convenience common pre-built types.
static const TypeKlassPtr* OBJECT; // Not-null object klass or below
static const TypeKlassPtr* OBJECT_OR_NULL; // Maybe-null version of same
--- a/hotspot/src/share/vm/runtime/handles.cpp Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/src/share/vm/runtime/handles.cpp Thu Oct 31 14:54:14 2013 -0700
@@ -45,7 +45,7 @@
oop* HandleArea::allocate_handle(oop obj) {
assert(_handle_mark_nesting > 1, "memory leak: allocating handle outside HandleMark");
assert(_no_handle_mark_nesting == 0, "allocating handle inside NoHandleMark");
- assert(obj->is_oop(), "sanity check");
+ assert(obj->is_oop(), err_msg("not an oop: " INTPTR_FORMAT, (intptr_t*) obj));
return real_allocate_handle(obj);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/inlining/InlineDefaultMethod.java Thu Oct 31 14:54:14 2013 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8026735
+ * @summary CHA in C1 should make correct decisions about default methods
+ * @run main/othervm -Xcomp -XX:CompileOnly=InlineDefaultMethod::test -XX:TieredStopAtLevel=1 InlineDefaultMethod
+ */
+
+
+interface InterfaceWithDefaultMethod0 {
+ default public int defaultMethod() {
+ return 1;
+ }
+}
+
+interface InterfaceWithDefaultMethod1 extends InterfaceWithDefaultMethod0 { }
+
+abstract class Subtype implements InterfaceWithDefaultMethod1 { }
+
+class Decoy extends Subtype {
+ public int defaultMethod() {
+ return 2;
+ }
+}
+
+class Instance extends Subtype { }
+
+public class InlineDefaultMethod {
+ public static int test(InterfaceWithDefaultMethod1 x) {
+ return x.defaultMethod();
+ }
+ public static void main(String[] args) {
+ InterfaceWithDefaultMethod1 a = new Decoy();
+ InterfaceWithDefaultMethod1 b = new Instance();
+ if (test(a) != 2 ||
+ test(b) != 1) {
+ System.err.println("FAILED");
+ System.exit(97);
+ }
+ System.err.println("PASSED");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/NestedMathExactTest.java Thu Oct 31 14:54:14 2013 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8027444
+ * @summary Test nested loops
+ * @compile NestedMathExactTest.java
+ * @run main NestedMathExactTest
+ *
+ */
+
+public class NestedMathExactTest {
+ public static final int LIMIT = 100;
+ public static int[] result = new int[LIMIT];
+ public static int value = 17;
+
+ public static void main(String[] args) {
+ for (int i = 0; i < 100; ++i) {
+ result[i] = runTest();
+ }
+ }
+
+ public static int runTest() {
+ int sum = 0;
+ for (int j = 0; j < 100000; j = Math.addExact(j, 1)) {
+ sum = 1;
+ for (int i = 0; i < 5; ++i) {
+ sum *= value;
+ }
+ }
+ return sum;
+ }
+}
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java Thu Oct 31 14:54:14 2013 -0700
@@ -24,6 +24,7 @@
/*
* @test
* @bug 8026844
+ * @bug 8027353
* @summary Test constant subtractExact
* @compile SubExactLConstantTest.java Verify.java
* @run main SubExactLConstantTest
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java Wed Oct 30 16:31:33 2013 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java Thu Oct 31 14:54:14 2013 -0700
@@ -24,6 +24,7 @@
/*
* @test
* @bug 8026844
+ * @bug 8027353
* @summary Test non constant subtractExact
* @compile SubExactLNonConstantTest.java Verify.java
* @run main SubExactLNonConstantTest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/startup/StartupOutput.java Thu Oct 31 14:54:14 2013 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8026949
+ * @summary Test ensures correct VM output during startup
+ * @library ../../testlibrary
+ *
+ */
+import com.oracle.java.testlibrary.*;
+
+public class StartupOutput {
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb;
+ OutputAnalyzer out;
+
+ pb = ProcessTools.createJavaProcessBuilder("-Xint", "-XX:+DisplayVMOutputToStdout", "-version");
+ out = new OutputAnalyzer(pb.start());
+ out.shouldNotContain("no space to run compilers");
+
+ out.shouldHaveExitValue(0);
+ }
+}