# HG changeset patch # User Thomas Wuerthinger # Date 1324166494 -3600 # Node ID 716a2c5c06568fb60559ef6a6785c0b44472fde4 # Parent feb590a8497fe2a5e48eb3eb0ffd3ca9b28685e1 Further reduce diff to HotSpot. diff -r feb590a8497f -r 716a2c5c0656 src/cpu/sparc/vm/assembler_sparc.cpp --- a/src/cpu/sparc/vm/assembler_sparc.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/cpu/sparc/vm/assembler_sparc.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -1841,7 +1841,6 @@ delayed()->nop(); // recover frame size add(SP, 8*8,SP); - BLOCK_COMMENT("} verify_oop"); } // side-door communication with signalHandler in os_solaris.cpp diff -r feb590a8497f -r 716a2c5c0656 src/cpu/x86/vm/c1_MacroAssembler_x86.cpp --- a/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -324,7 +324,7 @@ const Register len_zero = len; initialize_body(obj, arr_size, header_size * BytesPerWord, len_zero); - // (tw) fix me + // TODO(tw): Re-enable this code once Graal no longer uses this method. // if (CURRENT_ENV->dtrace_alloc_probes()) { // assert(obj == rax, "must be"); // call(RuntimeAddress(Runtime1::entry_for(Runtime1::dtrace_object_alloc_id))); diff -r feb590a8497f -r 716a2c5c0656 src/cpu/x86/vm/c1_globals_x86.hpp --- a/src/cpu/x86/vm/c1_globals_x86.hpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/cpu/x86/vm/c1_globals_x86.hpp Sun Dec 18 01:01:34 2011 +0100 @@ -37,7 +37,7 @@ define_pd_global(bool, ResizeTLAB, true ); define_pd_global(bool, InlineIntrinsics, true ); define_pd_global(bool, PreferInterpreterNativeStubs, false); -define_pd_global(bool, ProfileTraps, true ); +define_pd_global(bool, ProfileTraps, true ); // changed for GRAAL define_pd_global(bool, UseOnStackReplacement, true ); define_pd_global(bool, TieredCompilation, false); define_pd_global(intx, CompileThreshold, 4500 ); // changed for GRAAL @@ -47,7 +47,7 @@ define_pd_global(intx, FreqInlineSize, 325 ); define_pd_global(intx, NewSizeThreadIncrease, 4*K ); define_pd_global(intx, InitialCodeCacheSize, 4*M); // changed for GRAAL -define_pd_global(intx, ReservedCodeCacheSize, 50*M ); +define_pd_global(intx, ReservedCodeCacheSize, 50*M ); // changed for GRAAL define_pd_global(bool, ProfileInterpreter, true ); // changed for GRAAL define_pd_global(intx, CodeCacheExpansionSize, 64*K ); // changed for GRAAL define_pd_global(uintx,CodeCacheMinBlockLength, 4); // changed for GRAAL diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/c1/c1_Compiler.cpp --- a/src/share/vm/c1/c1_Compiler.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/c1/c1_Compiler.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -90,7 +90,6 @@ void Compiler::compile_method(ciEnv* env, ciMethod* method, int entry_bci) { - assert(!UseGraal, "c1 called in UseGraal mode!"); // Allocate buffer blob once at startup since allocation for each // compilation seems to be too expensive (at least on Intel win32). BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob(); diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/c1/c1_globals.hpp --- a/src/share/vm/c1/c1_globals.hpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/c1/c1_globals.hpp Sun Dec 18 01:01:34 2011 +0100 @@ -246,7 +246,7 @@ develop(bool, UseFastNewObjectArray, true, \ "Use fast inlined object array allocation") \ \ - product(bool, UseFastLocking, true, \ + develop(bool, UseFastLocking, true, \ "Use fast inlined locking code") \ \ develop(bool, UseSlowPath, false, \ diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/ci/ciInstanceKlass.cpp --- a/src/share/vm/ci/ciInstanceKlass.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/ci/ciInstanceKlass.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -67,14 +67,15 @@ Thread *thread = Thread::current(); if (ciObjectFactory::is_initialized()) { _loader = JNIHandles::make_local(thread, ik->class_loader()); - _protection_domain = JNIHandles::make_local(thread, ik->protection_domain()); + _protection_domain = JNIHandles::make_local(thread, + ik->protection_domain()); _is_shared = false; } else { Handle h_loader(thread, ik->class_loader()); Handle h_protection_domain(thread, ik->protection_domain()); _loader = JNIHandles::make_global(h_loader); _protection_domain = JNIHandles::make_global(h_protection_domain); - _is_shared = !ciObjectFactory::is_initialized(); + _is_shared = true; } // Lazy fields get filled in only upon request. diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/ci/ciSymbol.hpp --- a/src/share/vm/ci/ciSymbol.hpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/ci/ciSymbol.hpp Sun Dec 18 01:01:34 2011 +0100 @@ -53,10 +53,8 @@ ciSymbol(Symbol* s); // normal case, for symbols not mentioned in vmSymbols ciSymbol(Symbol* s, vmSymbols::SID sid); // for use with vmSymbols -public: Symbol* get_symbol() const { return _symbol; } -private: const char* type_string() { return "ciSymbol"; } void print_impl(outputStream* st); diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/compiler/compileBroker.hpp --- a/src/share/vm/compiler/compileBroker.hpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/compiler/compileBroker.hpp Sun Dec 18 01:01:34 2011 +0100 @@ -299,8 +299,6 @@ static int _sum_nmethod_size; static int _sum_nmethod_code_size; - static bool _poll_java_queue; - static CompilerThread* make_compiler_thread(const char* name, CompileQueue* queue, CompilerCounters* counters, TRAPS); static void init_compiler_threads(int c1_compiler_count, int c2_compiler_count); static bool compilation_is_complete (methodHandle method, int osr_bci, int comp_level); @@ -405,8 +403,6 @@ static void print_last_compile(); static void print_compiler_threads_on(outputStream* st); - - static void add_method_to_queue(klassOop k, Symbol* name, Symbol* signature); }; #endif // SHARE_VM_COMPILER_COMPILEBROKER_HPP diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/compiler/compilerOracle.cpp --- a/src/share/vm/compiler/compilerOracle.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/compiler/compilerOracle.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -471,7 +471,7 @@ line += bytes_read; if (command == UnknownCommand) { - tty->print_cr("CompilerOracle: UnknownCommand"); + tty->print_cr("CompilerOracle: unrecognized line"); tty->print_cr(" \"%s\"", original_line); return; } diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/opto/callGenerator.hpp --- a/src/share/vm/opto/callGenerator.hpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/opto/callGenerator.hpp Sun Dec 18 01:01:34 2011 +0100 @@ -117,8 +117,6 @@ static CallGenerator* for_method_handle_inline(Node* method_handle, JVMState* jvms, ciMethod* caller, ciMethod* callee, ciCallProfile profile); static CallGenerator* for_invokedynamic_inline(ciCallSite* call_site, JVMState* jvms, ciMethod* caller, ciMethod* callee, ciCallProfile profile); - static CallGenerator* for_method_handle_inline(Node* method_handle, JVMState* jvms, ciMethod* caller, ciMethod* callee, ciCallProfile profile); - // How to generate a replace a direct call with an inline version static CallGenerator* for_late_inline(ciMethod* m, CallGenerator* inline_cg); diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/runtime/deoptimization.cpp --- a/src/share/vm/runtime/deoptimization.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/runtime/deoptimization.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -212,6 +212,7 @@ assert(vf->is_compiled_frame(), "Wrong frame type"); chunk->push(compiledVFrame::cast(vf)); + // TODO(tw): Fix this hack after introducing GRAAL macro. //#ifdef COMPILER2 // Reallocate the non-escaping objects and restore their fields. Then // relock objects if synchronization on them was eliminated. @@ -1255,14 +1256,12 @@ DeoptAction action = trap_request_action(trap_request); jint unloaded_class_index = trap_request_index(trap_request); // CP idx or -1 -// tty->print_cr("trap_request: %08x, cpi: %i, pc: %016x", trap_request, unloaded_class_index, fr.pc()); - - Events::log("Uncommon trap occurred @" INTPTR_FORMAT " unloaded_class_index = %d", fr.pc(), (int) trap_request); vframe* vf = vframe::new_vframe(&fr, ®_map, thread); compiledVFrame* cvf = compiledVFrame::cast(vf); - + nmethod* nm = cvf->code(); + ScopeDesc* trap_scope = cvf->scope(); if (TraceDeoptimization) { diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/runtime/globals.hpp --- a/src/share/vm/runtime/globals.hpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/runtime/globals.hpp Sun Dec 18 01:01:34 2011 +0100 @@ -884,9 +884,6 @@ diagnostic(bool, LogCompilation, false, \ "Log compilation activity in detail to hotspot.log or LogFile") \ \ - product(intx, MaxCompilationID, -1, \ - "All methods with greater compilation ID are skipped") \ - \ product(bool, PrintCompilation, false, \ "Print compilations") \ \ diff -r feb590a8497f -r 716a2c5c0656 src/share/vm/utilities/exceptions.cpp --- a/src/share/vm/utilities/exceptions.cpp Sun Dec 18 00:41:15 2011 +0100 +++ b/src/share/vm/utilities/exceptions.cpp Sun Dec 18 01:01:34 2011 +0100 @@ -95,7 +95,7 @@ #endif // ASSERT if (thread->is_VM_thread() - // (tw) May we do this? + // TODO(tw): May we do this? /*|| thread->is_Compiler_thread()*/ ) { // We do not care what kind of exception we get for the vm-thread or a thread which // is compiling. We just install a dummy exception object @@ -119,7 +119,7 @@ } if (thread->is_VM_thread() - // (tw) May we do this? + // TODO(tw): May we do this? /* || thread->is_Compiler_thread()*/ ) { // We do not care what kind of exception we get for the vm-thread or a thread which // is compiling. We just install a dummy exception object