changeset 52747:0d9d45b7a8b0

Merge
author pliden
date Mon, 29 Oct 2018 09:54:43 +0100
parents 3b6680f7542f 65c1ca045607
children 587e29a443b7
files .jcheck/conf make/autoconf/hotspot.m4 make/conf/jib-profiles.js make/hotspot/lib/CompileJvm.gmk src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp src/hotspot/cpu/aarch64/compiledIC_aot_aarch64.cpp src/hotspot/cpu/aarch64/nmethodEntryBarrier_aarch64.cpp src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp src/hotspot/cpu/arm/compiledIC_arm.cpp src/hotspot/cpu/arm/nmethodEntryBarrier_arm.cpp src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp src/hotspot/cpu/ppc/compiledIC_ppc.cpp src/hotspot/cpu/ppc/nmethodEntryBarrier_ppc.cpp src/hotspot/cpu/ppc/stubGenerator_ppc.cpp src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp src/hotspot/cpu/s390/compiledIC_s390.cpp src/hotspot/cpu/s390/nmethodEntryBarrier_s390.cpp src/hotspot/cpu/s390/stubGenerator_s390.cpp src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.cpp src/hotspot/cpu/sparc/compiledIC_sparc.cpp src/hotspot/cpu/sparc/macroAssembler_sparc.cpp src/hotspot/cpu/sparc/nativeInst_sparc.cpp src/hotspot/cpu/sparc/nmethodEntryBarrier_sparc.cpp src/hotspot/cpu/sparc/templateInterpreterGenerator_sparc.cpp src/hotspot/cpu/x86/assembler_x86.cpp src/hotspot/cpu/x86/assembler_x86.hpp src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp src/hotspot/cpu/x86/c1_Runtime1_x86.cpp src/hotspot/cpu/x86/compiledIC_aot_x86_64.cpp src/hotspot/cpu/x86/compiledIC_x86.cpp src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp src/hotspot/cpu/x86/macroAssembler_x86.cpp src/hotspot/cpu/x86/macroAssembler_x86.hpp src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp src/hotspot/cpu/x86/macroAssembler_x86_log.cpp src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp src/hotspot/cpu/x86/nativeInst_x86.cpp src/hotspot/cpu/x86/nmethodEntryBarrier_x86.cpp src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp src/hotspot/cpu/x86/stubGenerator_x86_32.cpp src/hotspot/cpu/x86/stubGenerator_x86_64.cpp src/hotspot/cpu/x86/stubRoutines_x86.hpp src/hotspot/cpu/x86/stubRoutines_x86_64.cpp src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp src/hotspot/cpu/x86/templateTable_x86.cpp src/hotspot/cpu/x86/x86.ad src/hotspot/cpu/x86/x86_64.ad src/hotspot/cpu/zero/nmethodEntryBarrier_zero.cpp src/hotspot/os/linux/os_linux.cpp src/hotspot/os/linux/os_linux.hpp src/hotspot/os/solaris/os_solaris.cpp src/hotspot/os/solaris/os_solaris.hpp src/hotspot/share/aot/aotCodeHeap.cpp src/hotspot/share/aot/aotCompiledMethod.cpp src/hotspot/share/aot/aotCompiledMethod.hpp src/hotspot/share/c1/c1_CodeStubs.hpp src/hotspot/share/c1/c1_LIR.cpp src/hotspot/share/c1/c1_LIR.hpp src/hotspot/share/c1/c1_LIRAssembler.cpp src/hotspot/share/c1/c1_LIRAssembler.hpp src/hotspot/share/c1/c1_LIRGenerator.cpp src/hotspot/share/c1/c1_Runtime1.cpp src/hotspot/share/classfile/classLoaderData.cpp src/hotspot/share/classfile/classLoaderData.hpp src/hotspot/share/classfile/dictionary.cpp src/hotspot/share/classfile/javaClasses.cpp src/hotspot/share/classfile/javaClasses.hpp src/hotspot/share/classfile/metadataOnStackMark.cpp src/hotspot/share/classfile/moduleEntry.cpp src/hotspot/share/classfile/packageEntry.cpp src/hotspot/share/classfile/stringTable.cpp src/hotspot/share/classfile/stringTable.hpp src/hotspot/share/classfile/systemDictionary.cpp src/hotspot/share/classfile/vmSymbols.cpp src/hotspot/share/code/codeBlob.hpp src/hotspot/share/code/codeCache.cpp src/hotspot/share/code/codeCache.hpp src/hotspot/share/code/compiledIC.cpp src/hotspot/share/code/compiledIC.hpp src/hotspot/share/code/compiledMethod.cpp src/hotspot/share/code/compiledMethod.hpp src/hotspot/share/code/dependencyContext.cpp src/hotspot/share/code/dependencyContext.hpp src/hotspot/share/code/icBuffer.cpp src/hotspot/share/code/nmethod.cpp src/hotspot/share/code/nmethod.hpp src/hotspot/share/code/nmethodEntryBarrier.cpp src/hotspot/share/code/nmethodEntryBarrier.hpp src/hotspot/share/code/vtableStubs.cpp src/hotspot/share/compiler/oopMap.cpp src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp src/hotspot/share/gc/g1/g1CollectedHeap.cpp src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp src/hotspot/share/gc/g1/g1HeapVerifier.cpp src/hotspot/share/gc/g1/g1OopClosures.hpp src/hotspot/share/gc/parallel/pcTasks.cpp src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp src/hotspot/share/gc/parallel/psParallelCompact.cpp src/hotspot/share/gc/parallel/psScavenge.inline.hpp src/hotspot/share/gc/serial/markSweep.cpp src/hotspot/share/gc/shared/barrierSet.hpp src/hotspot/share/gc/shared/collectedHeap.cpp src/hotspot/share/gc/shared/collectedHeap.hpp src/hotspot/share/gc/shared/gcBehaviours.cpp src/hotspot/share/gc/shared/gcBehaviours.hpp src/hotspot/share/gc/shared/gcThreadLocalData.hpp src/hotspot/share/gc/shared/oopStorage.cpp src/hotspot/share/gc/shared/oopStorage.hpp src/hotspot/share/gc/shared/oopStorageParState.hpp src/hotspot/share/gc/shared/parallelCleaning.cpp src/hotspot/share/gc/shared/parallelCleaning.hpp src/hotspot/share/gc/shared/referenceProcessor.hpp src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp src/hotspot/share/gc/shared/workgroup.cpp src/hotspot/share/gc/shared/workgroup.hpp src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp src/hotspot/share/gc/z/zArguments.cpp src/hotspot/share/gc/z/zBarrierSet.cpp src/hotspot/share/gc/z/zCollectedHeap.cpp src/hotspot/share/gc/z/zCollectedHeap.hpp src/hotspot/share/gc/z/zGlobalBehaviours.cpp src/hotspot/share/gc/z/zGlobalBehaviours.hpp src/hotspot/share/gc/z/zHeap.cpp src/hotspot/share/gc/z/zHeap.hpp src/hotspot/share/gc/z/zHeap.inline.hpp src/hotspot/share/gc/z/zHeapIterator.cpp src/hotspot/share/gc/z/zLock.hpp src/hotspot/share/gc/z/zLock.inline.hpp src/hotspot/share/gc/z/zMark.cpp src/hotspot/share/gc/z/zNMethodEntryBarrier.cpp src/hotspot/share/gc/z/zNMethodEntryBarrier.hpp src/hotspot/share/gc/z/zNMethodTable.cpp src/hotspot/share/gc/z/zNMethodTable.hpp src/hotspot/share/gc/z/zNMethodTableEntry.hpp src/hotspot/share/gc/z/zOopClosures.hpp src/hotspot/share/gc/z/zOopClosures.inline.hpp src/hotspot/share/gc/z/zRootsIterator.cpp src/hotspot/share/gc/z/zRootsIterator.hpp src/hotspot/share/gc/z/zThreadLocalData.hpp src/hotspot/share/interpreter/interpreterRuntime.cpp src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.cpp src/hotspot/share/jfr/metadata/metadata.xml src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp src/hotspot/share/logging/logTag.hpp src/hotspot/share/memory/iterator.hpp src/hotspot/share/memory/metaspace.cpp src/hotspot/share/memory/metaspace.hpp src/hotspot/share/memory/metaspace/virtualSpaceList.cpp src/hotspot/share/memory/universe.cpp src/hotspot/share/memory/universe.hpp src/hotspot/share/oops/compiledICHolder.cpp src/hotspot/share/oops/compiledICHolder.hpp src/hotspot/share/oops/instanceKlass.cpp src/hotspot/share/oops/instanceRefKlass.inline.hpp src/hotspot/share/oops/klass.cpp src/hotspot/share/oops/method.cpp src/hotspot/share/oops/methodData.hpp src/hotspot/share/oops/oop.cpp src/hotspot/share/oops/oop.hpp src/hotspot/share/oops/oop.inline.hpp src/hotspot/share/oops/weakHandle.inline.hpp src/hotspot/share/opto/arraycopynode.cpp src/hotspot/share/opto/compile.cpp src/hotspot/share/opto/graphKit.cpp src/hotspot/share/opto/graphKit.hpp src/hotspot/share/opto/library_call.cpp src/hotspot/share/opto/loopopts.cpp src/hotspot/share/opto/macro.cpp src/hotspot/share/opto/macro.hpp src/hotspot/share/opto/macroArrayCopy.cpp src/hotspot/share/opto/memnode.cpp src/hotspot/share/opto/node.cpp src/hotspot/share/opto/node.hpp src/hotspot/share/opto/parse2.cpp src/hotspot/share/opto/parse3.cpp src/hotspot/share/opto/phaseX.cpp src/hotspot/share/prims/jvmtiTagMap.cpp src/hotspot/share/prims/whitebox.cpp src/hotspot/share/runtime/arguments.cpp src/hotspot/share/runtime/globals.hpp src/hotspot/share/runtime/javaCalls.cpp src/hotspot/share/runtime/mutexLocker.cpp src/hotspot/share/runtime/mutexLocker.hpp src/hotspot/share/runtime/os.hpp src/hotspot/share/runtime/sharedRuntime.cpp src/hotspot/share/runtime/sweeper.cpp src/hotspot/share/runtime/thread.cpp src/hotspot/share/runtime/thread.hpp src/hotspot/share/runtime/vmBehaviours.cpp src/hotspot/share/runtime/vmBehaviours.hpp src/hotspot/share/runtime/vmStructs.cpp src/hotspot/share/runtime/vmThread.cpp src/hotspot/share/services/heapDumper.cpp src/hotspot/share/utilities/behaviours.cpp src/hotspot/share/utilities/behaviours.hpp src/hotspot/share/utilities/globalDefinitions_gcc.hpp src/hotspot/share/utilities/vmError.cpp src/jdk.jfr/share/conf/jfr/default.jfc src/jdk.jfr/share/conf/jfr/profile.jfc test/hotspot/gtest/utilities/test_behaviours.cpp test/hotspot/jtreg/TEST.ROOT test/hotspot/jtreg/compiler/unsafe/JdkInternalMiscUnsafeAccessTestObject.java test/hotspot/jtreg/gc/TestAllocateHeapAt.java test/hotspot/jtreg/gc/TestAllocateHeapAtError.java test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java test/hotspot/jtreg/runtime/ClassUnload/UnloadTest.java test/hotspot/jtreg/runtime/appcds/customLoader/UnloadUnregisteredLoaderTest.java test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java test/jdk/TEST.ROOT
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff