hg: valhalla/valhalla: Merge

mandy.chung at oracle.com mandy.chung at oracle.com
Thu Nov 21 22:18:00 UTC 2019


Changeset: 8043aa8339b0
Author:    mchung
Date:      2019-11-21 14:13 -0800
URL:       https://hg.openjdk.java.net/valhalla/valhalla/rev/8043aa8339b0

Merge

! src/hotspot/share/aot/aotCodeHeap.cpp
! src/hotspot/share/ci/ciField.cpp
! src/hotspot/share/ci/ciInstanceKlass.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/defaultMethods.cpp
! src/hotspot/share/classfile/javaClasses.cpp
! src/hotspot/share/classfile/javaClasses.hpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/systemDictionaryShared.cpp
! src/hotspot/share/classfile/vmSymbols.cpp
- src/hotspot/share/gc/cms/adaptiveFreeList.cpp
- src/hotspot/share/gc/cms/adaptiveFreeList.hpp
- src/hotspot/share/gc/cms/allocationStats.cpp
- src/hotspot/share/gc/cms/allocationStats.hpp
- src/hotspot/share/gc/cms/cmsArguments.cpp
- src/hotspot/share/gc/cms/cmsArguments.hpp
- src/hotspot/share/gc/cms/cmsCardTable.cpp
- src/hotspot/share/gc/cms/cmsCardTable.hpp
- src/hotspot/share/gc/cms/cmsGCStats.cpp
- src/hotspot/share/gc/cms/cmsGCStats.hpp
- src/hotspot/share/gc/cms/cmsHeap.cpp
- src/hotspot/share/gc/cms/cmsHeap.hpp
- src/hotspot/share/gc/cms/cmsHeap.inline.hpp
- src/hotspot/share/gc/cms/cmsLockVerifier.cpp
- src/hotspot/share/gc/cms/cmsLockVerifier.hpp
- src/hotspot/share/gc/cms/cmsOopClosures.hpp
- src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp
- src/hotspot/share/gc/cms/cmsVMOperations.cpp
- src/hotspot/share/gc/cms/cmsVMOperations.hpp
- src/hotspot/share/gc/cms/cms_globals.hpp
- src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
- src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
- src/hotspot/share/gc/cms/compactibleFreeListSpace.inline.hpp
- src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
- src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp
- src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp
- src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
- src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp
- src/hotspot/share/gc/cms/freeChunk.cpp
- src/hotspot/share/gc/cms/freeChunk.hpp
- src/hotspot/share/gc/cms/gSpaceCounters.cpp
- src/hotspot/share/gc/cms/gSpaceCounters.hpp
- src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.cpp
- src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp
- src/hotspot/share/gc/cms/parNewGeneration.cpp
- src/hotspot/share/gc/cms/parNewGeneration.hpp
- src/hotspot/share/gc/cms/parNewGeneration.inline.hpp
- src/hotspot/share/gc/cms/parOopClosures.hpp
- src/hotspot/share/gc/cms/parOopClosures.inline.hpp
- src/hotspot/share/gc/cms/promotionInfo.cpp
- src/hotspot/share/gc/cms/promotionInfo.hpp
- src/hotspot/share/gc/cms/promotionInfo.inline.hpp
- src/hotspot/share/gc/cms/vmStructs_cms.hpp
- src/hotspot/share/gc/cms/yieldingWorkgroup.cpp
- src/hotspot/share/gc/cms/yieldingWorkgroup.hpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/interpreter/linkResolver.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/memory/metaspace.cpp
! src/hotspot/share/memory/metaspace.hpp
! src/hotspot/share/memory/metaspaceShared.cpp
! src/hotspot/share/oops/cpCache.cpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klassVtable.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/reflection.cpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
- src/java.desktop/share/legal/opengl.md
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/AdaptiveFreeList.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSCollector.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CMSHeap.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ConcurrentMarkSweepGeneration.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/LinearAllocBlock.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/cms/ParNewGeneration.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/PrintRegionClosure.java
! test/hotspot/jtreg/ProblemList.txt
- test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesCMS.java
- test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesCMSCondMark.java
- test/hotspot/jtreg/gc/TestMemoryInitializationWithCMS.java
- test/hotspot/jtreg/gc/arguments/TestCMSHeapSizeFlags.java
- test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
- test/hotspot/jtreg/gc/cms/DisableResizePLAB.java
- test/hotspot/jtreg/gc/cms/GuardShrinkWarning.java
- test/hotspot/jtreg/gc/cms/TestBubbleUpRef.java
- test/hotspot/jtreg/gc/cms/TestCMSScavengeBeforeRemark.java
- test/hotspot/jtreg/gc/cms/TestCriticalPriority.java
- test/hotspot/jtreg/gc/cms/TestMBeanCMS.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlCMS.java
- test/hotspot/jtreg/gc/metaspace/TestMetaspaceCMSCancel.java
- test/hotspot/jtreg/gc/startup_warnings/TestCMS.java
- test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithCMS.java
- test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithCMS.java
- test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithCMS.java
- test/hotspot/jtreg/gc/stress/jfr/TestStressAllocationGCEventsWithCMS.java
- test/hotspot/jtreg/gc/stress/jfr/TestStressAllocationGCEventsWithParNew.java
- test/hotspot/jtreg/gc/stress/jfr/TestStressBigAllocationGCEventsWithCMS.java
- test/hotspot/jtreg/gc/stress/jfr/TestStressBigAllocationGCEventsWithParNew.java
- test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithCMS.java
! test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCCMSTest.java
! test/jdk/ProblemList.txt
- test/jdk/java/awt/Color/AlphaColorTest.java
- test/jdk/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java
- test/jdk/java/awt/Color/HeadlessColor.java
- test/jdk/java/awt/Color/LoadProfileWithSM.java
- test/jdk/java/awt/Color/LoadStandardProfilesTest.java
- test/jdk/java/awt/Color/OpacityChange/OpacityChange.java
- test/jdk/java/awt/Color/XRenderTranslucentColorDrawTest.java
- test/jdk/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh
- test/jdk/java/nio/channels/DatagramChannel/AddressesAfterDisconnect.java
- test/jdk/java/util/Arrays/ParallelSorting.java
- test/jdk/javax/swing/JEditorPane/8226513/JEditorPaneLayoutTest.java
- test/jdk/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
- test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
- test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
- test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
- test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
- test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
- test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
- test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
- test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
- test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
- test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
- test/jdk/jdk/jfr/event/oldobject/TestCMS.java
- test/jdk/jdk/modules/etc/src/TestJson.java
- test/jdk/jdk/modules/etc/src/TestRootModules.java
- test/jdk/sun/security/tools/keytool/DeprecateKeyalg.java
- test/langtools/tools/javac/diags/examples/RestrictedTypeNotAllowedPreview.java



More information about the valhalla-dev mailing list