This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjdk-7-jre-dcevm.
commit adee721456a630ea254873cd744d897085d46012 Merge: eb6c6da 9866b7f Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 1 19:49:09 2014 +0200 Merge tag 'upstream/7u60' Upstream version 7u60 .hg_archival.txt | 4 +- .hgtags | 33 +- agent/src/os/linux/ps_core.c | 70 +- .../sun/jvm/hotspot/interpreter/Bytecodes.java | 10 +- .../sun/jvm/hotspot/jdi/JVMTIThreadState.java | 5 +- .../classes/sun/jvm/hotspot/runtime/OSThread.java | 6 +- make/bsd/makefiles/arm.make | 6 +- make/bsd/makefiles/buildtree.make | 4 +- make/bsd/makefiles/gcc.make | 5 +- make/bsd/makefiles/vm.make | 9 +- make/hotspot_version | 4 +- make/linux/makefiles/arm.make | 6 +- make/linux/makefiles/buildtree.make | 4 +- make/linux/makefiles/gcc.make | 5 +- make/linux/makefiles/vm.make | 11 +- src/cpu/sparc/vm/assembler_sparc.cpp | 8 +- src/cpu/sparc/vm/c1_Runtime1_sparc.cpp | 11 +- src/cpu/sparc/vm/sparc.ad | 31 +- src/cpu/sparc/vm/templateInterpreter_sparc.cpp | 21 +- src/cpu/x86/vm/assembler_x86.cpp | 9 +- src/cpu/x86/vm/c1_LIRAssembler_x86.cpp | 16 +- src/cpu/x86/vm/c1_LIRGenerator_x86.cpp | 11 +- src/cpu/x86/vm/c1_Runtime1_x86.cpp | 11 +- src/cpu/x86/vm/frame_x86.cpp | 11 +- src/cpu/x86/vm/globals_x86.hpp | 2 +- src/cpu/x86/vm/templateInterpreter_x86_32.cpp | 23 +- src/cpu/x86/vm/templateInterpreter_x86_64.cpp | 23 +- src/cpu/x86/vm/x86_32.ad | 17 +- src/cpu/x86/vm/x86_64.ad | 17 +- src/cpu/zero/vm/entryFrame_zero.hpp | 6 +- src/cpu/zero/vm/frame_zero.inline.hpp | 4 +- src/os/bsd/vm/attachListener_bsd.cpp | 4 +- src/os/bsd/vm/os_bsd.cpp | 14 +- src/os/linux/vm/globals_linux.hpp | 5 +- src/os/linux/vm/jsig.c | 10 +- src/os/linux/vm/os_linux.cpp | 786 ++++++++++++++++----- src/os/linux/vm/os_linux.hpp | 40 +- src/os/posix/vm/os_posix.cpp | 13 +- src/os/solaris/vm/os_solaris.cpp | 12 +- src/os/windows/vm/os_windows.cpp | 31 +- src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 43 ++ src/os_cpu/linux_x86/vm/os_linux_x86.hpp | 13 + src/share/vm/c1/c1_GraphBuilder.cpp | 4 +- src/share/vm/c1/c1_LIR.hpp | 2 +- src/share/vm/c1/c1_LinearScan.cpp | 6 +- src/share/vm/c1/c1_Runtime1.cpp | 26 +- src/share/vm/classfile/classFileParser.cpp | 11 +- src/share/vm/classfile/javaClasses.cpp | 30 +- src/share/vm/classfile/javaClasses.hpp | 29 +- src/share/vm/classfile/symbolTable.cpp | 133 +++- src/share/vm/classfile/symbolTable.hpp | 41 +- src/share/vm/classfile/systemDictionary.cpp | 31 +- src/share/vm/classfile/systemDictionary.hpp | 9 +- src/share/vm/classfile/vmSymbols.hpp | 4 +- src/share/vm/code/nmethod.cpp | 37 +- src/share/vm/code/nmethod.hpp | 4 +- .../concurrentMarkSweep/cmsOopClosures.hpp | 18 +- .../concurrentMarkSweepGeneration.cpp | 296 ++++++-- .../concurrentMarkSweepGeneration.hpp | 12 +- .../concurrentMarkSweep/vmCMSOperations.cpp | 10 +- .../vm/gc_implementation/g1/concurrentG1Refine.cpp | 12 + .../vm/gc_implementation/g1/concurrentG1Refine.hpp | 9 +- .../vm/gc_implementation/g1/concurrentMark.cpp | 96 +-- .../vm/gc_implementation/g1/concurrentMark.hpp | 6 + .../gc_implementation/g1/concurrentMark.inline.hpp | 2 +- src/share/vm/gc_implementation/g1/g1CardCounts.cpp | 4 +- .../vm/gc_implementation/g1/g1CollectedHeap.cpp | 778 ++++++++++++++------ .../vm/gc_implementation/g1/g1CollectedHeap.hpp | 202 +++--- .../g1/g1CollectedHeap.inline.hpp | 3 +- .../vm/gc_implementation/g1/g1CollectorPolicy.cpp | 3 +- .../vm/gc_implementation/g1/g1EvacFailure.hpp | 4 +- .../vm/gc_implementation/g1/g1GCPhaseTimes.cpp | 20 + .../vm/gc_implementation/g1/g1GCPhaseTimes.hpp | 23 + src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 21 +- src/share/vm/gc_implementation/g1/g1RemSet.cpp | 168 ++--- src/share/vm/gc_implementation/g1/g1RemSet.hpp | 47 +- .../vm/gc_implementation/g1/g1RemSetSummary.cpp | 354 ++++++++++ .../vm/gc_implementation/g1/g1RemSetSummary.hpp | 118 ++++ .../g1/g1SATBCardTableModRefBS.cpp | 92 ++- .../g1/g1SATBCardTableModRefBS.hpp | 46 ++ src/share/vm/gc_implementation/g1/g1_globals.hpp | 12 +- src/share/vm/gc_implementation/g1/heapRegion.cpp | 452 ++++++++---- src/share/vm/gc_implementation/g1/heapRegion.hpp | 23 +- .../vm/gc_implementation/g1/heapRegionRemSet.cpp | 138 +++- .../vm/gc_implementation/g1/heapRegionRemSet.hpp | 40 +- src/share/vm/gc_implementation/g1/ptrQueue.hpp | 4 + .../gc_implementation/parNew/parNewGeneration.cpp | 4 +- .../parallelScavenge/parallelScavengeHeap.cpp | 23 +- .../parallelScavenge/psAdaptiveSizePolicy.cpp | 48 ++ .../parallelScavenge/psAdaptiveSizePolicy.hpp | 7 +- .../parallelScavenge/psMarkSweep.cpp | 10 +- .../parallelScavenge/psParallelCompact.cpp | 12 +- .../parallelScavenge/psScavenge.cpp | 28 +- src/share/vm/gc_implementation/shared/gcTimer.cpp | 75 +- src/share/vm/gc_implementation/shared/gcTimer.hpp | 60 +- src/share/vm/gc_implementation/shared/gcTrace.cpp | 24 +- src/share/vm/gc_implementation/shared/gcTrace.hpp | 54 +- .../vm/gc_implementation/shared/gcTraceSend.cpp | 2 + .../vm/gc_implementation/shared/gcTraceTime.cpp | 19 +- .../vm/gc_implementation/shared/gcTraceTime.hpp | 3 +- .../shared/objectCountEventSender.cpp | 6 +- .../shared/objectCountEventSender.hpp | 3 +- src/share/vm/gc_interface/collectedHeap.cpp | 8 + src/share/vm/gc_interface/collectedHeap.hpp | 6 + src/share/vm/interpreter/interpreterRuntime.cpp | 23 +- src/share/vm/interpreter/interpreterRuntime.hpp | 3 +- src/share/vm/memory/cardTableModRefBS.cpp | 54 -- src/share/vm/memory/cardTableModRefBS.hpp | 24 - src/share/vm/memory/collectorPolicy.cpp | 2 + src/share/vm/memory/defNewGeneration.cpp | 17 +- src/share/vm/memory/genCollectedHeap.cpp | 55 +- src/share/vm/memory/generation.cpp | 8 +- src/share/vm/memory/generation.hpp | 1 + src/share/vm/memory/iterator.cpp | 2 +- src/share/vm/memory/sharedHeap.cpp | 8 +- src/share/vm/memory/sharedHeap.hpp | 3 +- src/share/vm/memory/universe.cpp | 19 +- src/share/vm/memory/universe.hpp | 12 +- src/share/vm/oops/constantPoolOop.cpp | 193 +++-- src/share/vm/oops/constantPoolOop.hpp | 44 +- src/share/vm/oops/instanceKlass.cpp | 37 +- src/share/vm/oops/instanceKlass.hpp | 10 +- src/share/vm/oops/objArrayKlass.cpp | 2 +- src/share/vm/opto/bytecodeInfo.cpp | 10 +- src/share/vm/opto/c2_globals.hpp | 3 + src/share/vm/opto/callGenerator.hpp | 3 +- src/share/vm/opto/coalesce.cpp | 37 +- src/share/vm/opto/compile.cpp | 79 ++- src/share/vm/opto/compile.hpp | 44 +- src/share/vm/opto/doCall.cpp | 4 +- src/share/vm/opto/graphKit.cpp | 19 +- src/share/vm/opto/library_call.cpp | 28 +- src/share/vm/opto/loopTransform.cpp | 6 +- src/share/vm/opto/memnode.cpp | 5 + src/share/vm/opto/memnode.hpp | 31 +- src/share/vm/opto/output.cpp | 15 +- src/share/vm/opto/reg_split.cpp | 11 +- src/share/vm/prims/jni.cpp | 8 + src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 2 +- src/share/vm/prims/jvmtiRedefineClasses.cpp | 459 ++++++++---- src/share/vm/prims/jvmtiRedefineClasses.hpp | 21 +- src/share/vm/prims/methodHandles.cpp | 197 ++++-- src/share/vm/prims/methodHandles.hpp | 43 +- src/share/vm/prims/whitebox.cpp | 10 + src/share/vm/runtime/arguments.cpp | 72 +- src/share/vm/runtime/arguments.hpp | 10 + src/share/vm/runtime/frame.cpp | 11 +- src/share/vm/runtime/globals.hpp | 25 +- src/share/vm/runtime/mutexLocker.cpp | 4 +- src/share/vm/runtime/mutexLocker.hpp | 3 +- src/share/vm/runtime/os.hpp | 4 +- src/share/vm/runtime/sweeper.cpp | 34 +- src/share/vm/runtime/sweeper.hpp | 26 +- src/share/vm/runtime/thread.cpp | 14 +- src/share/vm/runtime/virtualspace.cpp | 205 +++++- src/share/vm/runtime/virtualspace.hpp | 1 + src/share/vm/runtime/vmThread.cpp | 2 +- src/share/vm/runtime/vm_operations.cpp | 3 +- src/share/vm/runtime/vm_operations.hpp | 4 +- src/share/vm/services/attachListener.cpp | 38 +- src/share/vm/services/management.cpp | 23 +- src/share/vm/services/memTracker.hpp | 7 + src/share/vm/trace/noTraceBackend.hpp | 6 +- src/share/vm/trace/trace.xml | 4 +- src/share/vm/trace/traceBackend.hpp | 9 +- src/share/vm/trace/traceEvent.hpp | 29 +- src/share/vm/trace/traceEventClasses.xsl | 32 +- src/share/vm/trace/traceEventIds.xsl | 4 +- src/share/vm/trace/traceMacros.hpp | 2 +- src/share/vm/trace/traceTime.hpp | 5 +- src/share/vm/trace/traceTypes.xsl | 12 +- src/share/vm/trace/tracetypes.xml | 10 +- src/share/vm/trace/tracing.hpp | 2 +- src/share/vm/utilities/globalDefinitions.hpp | 16 + src/share/vm/utilities/growableArray.hpp | 8 + src/share/vm/utilities/ticks.cpp | 68 ++ src/share/vm/utilities/ticks.hpp | 111 +++ src/share/vm/utilities/ticks.inline.hpp | 97 +++ src/share/vm/utilities/vmError.cpp | 19 +- test/compiler/8004051/Test8004051.java | 56 ++ .../compiler/codegen/LoadWithMask.java | 44 +- .../compiler/codegen/LoadWithMask2.java | 55 +- test/compiler/gcbarriers/G1CrashTest.java | 84 +++ .../compiler/print/PrintInlining.java | 21 +- .../reflection/ArrayNewInstanceOfVoid.java | 33 +- .../regalloc/C1ObjectSpillInLogicOp.java} | 36 +- .../gc/8000311/Test8000311.java | 38 +- ...ngStartup.java => TestVerifyDuringStartup.java} | 8 +- test/gc/TestVerifySilently.java | 84 +++ test/gc/g1/TestHumongousCodeCacheRoots.java | 143 ++++ test/gc/g1/TestPrintRegionRememberedSetInfo.java | 92 +++ test/gc/g1/TestSummarizeRSetStats.java | 85 +++ test/gc/g1/TestSummarizeRSetStatsPerRegion.java | 55 ++ test/gc/g1/TestSummarizeRSetStatsThreads.java | 83 +++ test/gc/g1/TestSummarizeRSetStatsTools.java | 154 ++++ test/runtime/6929067/Test6929067.sh | 14 +- test/runtime/7107135/Test7107135.sh | 11 +- .../Test7107135.sh => jsig/Test8017498.sh} | 69 +- .../runtime/jsig/TestJNI.c | 43 +- .../runtime/jsig/TestJNI.java | 42 +- .../memory/LargePages/TestLargePagesFlags.java | 389 ++++++++++ test/testlibrary/OutputAnalyzerTest.java | 17 + .../oracle/java/testlibrary/OutputAnalyzer.java | 33 +- .../testlibrary/whitebox/sun/hotspot/WhiteBox.java | 3 + 204 files changed, 7206 insertions(+), 2104 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-7-jre-dcevm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
