# HG changeset patch # User Gilles Duboscq # Date 1413824840 -7200 # Node ID 2a69cbe850a87a6c9a16fe0fd14f6b7574ebc5ed # Parent 689092d5cf4474994c62e8f1f583b9e2afd09486 Reduce diff with upstream diff -r 689092d5cf44 -r 2a69cbe850a8 .jcheck/conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.jcheck/conf Mon Oct 20 19:07:20 2014 +0200 @@ -0,0 +1,2 @@ +project=jdk8 +bugids=dup diff -r 689092d5cf44 -r 2a69cbe850a8 make/bsd/makefiles/jsig.make --- a/make/bsd/makefiles/jsig.make Mon Oct 20 16:26:05 2014 +0200 +++ b/make/bsd/makefiles/jsig.make Mon Oct 20 19:07:20 2014 +0200 @@ -91,7 +91,7 @@ install_jsig: $(LIBJSIG) @echo "Copying $(LIBJSIG) to $(DEST_JSIG)" ifeq ($(OS_VENDOR), Darwin) - -$(QUIETLY) test -d $(LIBJSIG_DEBUGINFO) && \ + $(QUIETLY) test ! -d $(LIBJSIG_DEBUGINFO) || \ cp -f -r $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO) else $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \ diff -r 689092d5cf44 -r 2a69cbe850a8 make/bsd/makefiles/saproc.make --- a/make/bsd/makefiles/saproc.make Mon Oct 20 16:26:05 2014 +0200 +++ b/make/bsd/makefiles/saproc.make Mon Oct 20 19:07:20 2014 +0200 @@ -157,7 +157,7 @@ install_saproc: $(BUILDLIBSAPROC) @echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)" ifeq ($(OS_VENDOR), Darwin) - -$(QUIETLY) test -d $(LIBSAPROC_DEBUGINFO) && \ + $(QUIETLY) test ! -d $(LIBSAPROC_DEBUGINFO) || \ cp -f -r $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO) else $(QUIETLY) test -f $(LIBSAPROC_DEBUGINFO) && \ diff -r 689092d5cf44 -r 2a69cbe850a8 make/bsd/makefiles/vm.make --- a/make/bsd/makefiles/vm.make Mon Oct 20 16:26:05 2014 +0200 +++ b/make/bsd/makefiles/vm.make Mon Oct 20 19:07:20 2014 +0200 @@ -393,7 +393,7 @@ install_jvm: $(LIBJVM) @echo "Copying $(LIBJVM) to $(DEST_JVM)" ifeq ($(OS_VENDOR), Darwin) - -$(QUIETLY) test -d $(LIBJVM_DEBUGINFO) && \ + $(QUIETLY) test ! -d $(LIBJVM_DEBUGINFO) || \ cp -f -r $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) else $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ diff -r 689092d5cf44 -r 2a69cbe850a8 src/cpu/sparc/vm/interpreterGenerator_sparc.hpp --- a/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp Mon Oct 20 19:07:20 2014 +0200 @@ -33,7 +33,7 @@ address generate_normal_entry(bool synchronized); address generate_native_entry(bool synchronized); - address generate_abstract_entry(void); + address generate_abstract_entry(void); address generate_math_entry(AbstractInterpreter::MethodKind kind); address generate_empty_entry(void); address generate_accessor_entry(void); diff -r 689092d5cf44 -r 2a69cbe850a8 src/cpu/sparc/vm/sharedRuntime_sparc.cpp --- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -3671,6 +3671,7 @@ __ mov(O0, O2UnrollBlock->after_save()); RegisterSaver::restore_result_registers(masm); + Label noException; __ cmp_and_br_short(G4deopt_mode, Deoptimization::Unpack_exception, Assembler::notEqual, Assembler::pt, noException); diff -r 689092d5cf44 -r 2a69cbe850a8 src/cpu/sparc/vm/templateInterpreter_sparc.cpp --- a/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -824,7 +824,6 @@ return generate_accessor_entry(); } - // // Interpreter stub for calling a native method. (asm interpreter) // This sets up a somewhat different looking stack for calling the native method diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/tools/ProjectCreator/BuildConfig.java --- a/src/share/tools/ProjectCreator/BuildConfig.java Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/tools/ProjectCreator/BuildConfig.java Mon Oct 20 19:07:20 2014 +0200 @@ -515,9 +515,9 @@ case 'f': sb.append(flavour()); break; - case 'o': - sb.append(outputDir()); - break; + case 'o': + sb.append(outputDir()); + break; default: sb.append(ch); sb.append(ch1); diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/code/nmethod.cpp --- a/src/share/vm/code/nmethod.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/code/nmethod.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -664,6 +664,7 @@ + round_to(handler_table->size_in_bytes(), oopSize) + round_to(nul_chk_table->size_in_bytes(), oopSize) + round_to(debug_info->data_size() , oopSize); + nm = new (nmethod_size) nmethod(method(), nmethod_size, compile_id, entry_bci, offsets, orig_pc_offset, debug_info, dependencies, code_buffer, frame_size, @@ -934,7 +935,7 @@ #ifdef GRAAL _graal_installed_code = installed_code(); _speculation_log = (instanceOop)speculation_log(); -#endif + if (compiler->is_graal()) { // Graal might not produce any stub sections if (offsets->value(CodeOffsets::Exceptions) != -1) { @@ -953,17 +954,20 @@ _deoptimize_mh_offset = -1; } } else { - // Exception handler and deopt handler are in the stub section - assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); - assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); - - _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); - _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); - if (offsets->value(CodeOffsets::DeoptMH) != -1) { - _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); - } else { - _deoptimize_mh_offset = -1; - } +#endif + // Exception handler and deopt handler are in the stub section + assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); + assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); + + _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); + _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); + if (offsets->value(CodeOffsets::DeoptMH) != -1) { + _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); + } else { + _deoptimize_mh_offset = -1; +#ifdef GRAAL + } +#endif } if (offsets->value(CodeOffsets::UnwindHandler) != -1) { _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/code/oopRecorder.cpp --- a/src/share/vm/code/oopRecorder.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/code/oopRecorder.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -36,6 +36,7 @@ template int ValueRecorder::_missed_indexes = 0; #endif //ASSERT + template ValueRecorder::ValueRecorder(Arena* arena) { _handles = NULL; _indexes = NULL; diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/compiler/compileBroker.cpp --- a/src/share/vm/compiler/compileBroker.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/compiler/compileBroker.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -824,6 +824,7 @@ _compilers[1] = new C2Compiler(); } #endif // COMPILER2 + #else // SHARK int c1_count = 0; int c2_count = 1; diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/interpreter/interpreterRuntime.cpp --- a/src/share/vm/interpreter/interpreterRuntime.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -529,6 +529,7 @@ THROW(vmSymbols::java_lang_IncompatibleClassChangeError()); IRT_END + //------------------------------------------------------------------------------------------------------------------------ // Fields // diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/opto/superword.hpp --- a/src/share/vm/opto/superword.hpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/opto/superword.hpp Mon Oct 20 19:07:20 2014 +0200 @@ -201,30 +201,6 @@ static const SWNodeInfo initial; }; -//------------------------------OrderedPair--------------------------- -// Ordered pair of Node*. -class OrderedPair VALUE_OBJ_CLASS_SPEC { - protected: - Node* _p1; - Node* _p2; - public: - OrderedPair() : _p1(NULL), _p2(NULL) {} - OrderedPair(Node* p1, Node* p2) { - if (p1->_idx < p2->_idx) { - _p1 = p1; _p2 = p2; - } else { - _p1 = p2; _p2 = p1; - } - } - - bool operator==(const OrderedPair &rhs) { - return _p1 == rhs._p1 && _p2 == rhs._p2; - } - void print() { tty->print(" (%d, %d)", _p1->_idx, _p2->_idx); } - - static const OrderedPair initial; -}; - // -----------------------------SuperWord--------------------------------- // Transforms scalar operations into packed (superword) operations. class SuperWord : public ResourceObj { @@ -528,4 +504,29 @@ void print(); }; + +//------------------------------OrderedPair--------------------------- +// Ordered pair of Node*. +class OrderedPair VALUE_OBJ_CLASS_SPEC { + protected: + Node* _p1; + Node* _p2; + public: + OrderedPair() : _p1(NULL), _p2(NULL) {} + OrderedPair(Node* p1, Node* p2) { + if (p1->_idx < p2->_idx) { + _p1 = p1; _p2 = p2; + } else { + _p1 = p2; _p2 = p1; + } + } + + bool operator==(const OrderedPair &rhs) { + return _p1 == rhs._p1 && _p2 == rhs._p2; + } + void print() { tty->print(" (%d, %d)", _p1->_idx, _p2->_idx); } + + static const OrderedPair initial; +}; + #endif // SHARE_VM_OPTO_SUPERWORD_HPP diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/prims/jvm.cpp --- a/src/share/vm/prims/jvm.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/prims/jvm.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -1184,6 +1184,7 @@ return (jobject) JNIHandles::make_local(env, pd); JVM_END + static bool is_authorized(Handle context, instanceKlassHandle klass, TRAPS) { // If there is a security manager and protection domain, check the access // in the protection domain, otherwise it is authorized. diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/runtime/compilationPolicy.cpp --- a/src/share/vm/runtime/compilationPolicy.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/runtime/compilationPolicy.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -104,7 +104,6 @@ if (ReplayCompiles) return false; if (m->has_compiled_code()) return false; // already compiled - if (!can_be_compiled(m, comp_level)) return false; return !UseInterpreter || // must compile all methods diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/runtime/deoptimization.cpp --- a/src/share/vm/runtime/deoptimization.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/runtime/deoptimization.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -213,7 +213,6 @@ // Create a growable array of VFrames where each VFrame represents an inlined // Java frame. This storage is allocated with the usual system arena. assert(deoptee.is_compiled_frame(), "Wrong frame type"); - GrowableArray* chunk = new GrowableArray(10); vframe* vf = vframe::new_vframe(&deoptee, &map, thread); while (!vf->is_top()) { diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/runtime/mutexLocker.cpp --- a/src/share/vm/runtime/mutexLocker.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/runtime/mutexLocker.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -285,6 +285,7 @@ def(JfrStream_lock , Mutex, nonleaf+2, true); def(JfrStacktrace_lock , Mutex, special, true ); #endif + } GCMutexLocker::GCMutexLocker(Monitor * mutex) { diff -r 689092d5cf44 -r 2a69cbe850a8 src/share/vm/runtime/vmStructs.cpp --- a/src/share/vm/runtime/vmStructs.cpp Mon Oct 20 16:26:05 2014 +0200 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Oct 20 19:07:20 2014 +0200 @@ -160,7 +160,6 @@ #ifdef TARGET_OS_ARCH_bsd_zero # include "vmStructs_bsd_zero.hpp" #endif - #if INCLUDE_ALL_GCS #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" @@ -404,8 +403,8 @@ nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \ nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \ volatile_nonstatic_field(Symbol, _refcount, short) \ + nonstatic_field(Symbol, _identity_hash, int) \ nonstatic_field(Symbol, _length, unsigned short) \ - nonstatic_field(Symbol, _identity_hash, int) \ unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \ nonstatic_field(Symbol, _body[0], jbyte) \ nonstatic_field(TypeArrayKlass, _max_length, int) \ @@ -1346,6 +1345,7 @@ nonstatic_field(FreeList, _count, ssize_t) \ nonstatic_field(MetablockTreeDictionary, _total_size, size_t) + //-------------------------------------------------------------------------------- // VM_TYPES //