hg: jdk/sandbox: 3 new changesets

[ashipile at redhat.com]

Changeset: f67f588ebf15
Author:    shade
Date:      2018-05-03 09:43 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/f67f588ebf15

Merge

! src/hotspot/cpu/arm/stubGenerator_arm.cpp
! src/hotspot/cpu/arm/templateTable_arm.cpp
! src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
! src/hotspot/share/c1/c1_LIRGenerator.cpp
- src/hotspot/share/gc/cms/commandLineFlagConstraintsCMS.cpp
- src/hotspot/share/gc/cms/commandLineFlagConstraintsCMS.hpp
+ src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
! src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.cpp
! src/hotspot/share/gc/epsilon/epsilonHeap.hpp
- src/hotspot/share/gc/g1/bufferingOopClosure.hpp
- src/hotspot/share/gc/g1/commandLineFlagConstraintsG1.cpp
- src/hotspot/share/gc/g1/commandLineFlagConstraintsG1.hpp
- src/hotspot/share/gc/parallel/commandLineFlagConstraintsParallel.cpp
- src/hotspot/share/gc/parallel/commandLineFlagConstraintsParallel.hpp
! src/hotspot/share/gc/shared/barrierSet.hpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
- src/hotspot/share/gc/shared/commandLineFlagConstraintsGC.cpp
- src/hotspot/share/gc/shared/commandLineFlagConstraintsGC.hpp
! src/hotspot/share/gc/shared/gcConfig.cpp
+ src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+ src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/precompiled/precompiled.hpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/runtime/arguments.hpp
- src/hotspot/share/runtime/commandLineFlagConstraintList.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintList.hpp
- src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsCompiler.hpp
- src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsRuntime.hpp
- src/hotspot/share/runtime/commandLineFlagRangeList.cpp
- src/hotspot/share/runtime/commandLineFlagRangeList.hpp
- src/hotspot/share/runtime/commandLineFlagWriteableList.cpp
- src/hotspot/share/runtime/commandLineFlagWriteableList.hpp
+ src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
+ src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
+ src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
+ src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
+ src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
+ src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
+ src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp
+ src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp
+ src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
+ src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
! src/hotspot/share/runtime/globals.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/globals_extension.hpp
! src/hotspot/share/services/memoryManager.hpp
! src/hotspot/share/utilities/vmError.cpp
- src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferPool.java
- src/java.net.http/share/classes/jdk/internal/net/http/common/ByteBufferReference.java
- test/hotspot/gtest/gc/g1/test_bufferingOopClosure.cpp
! test/hotspot/jtreg/TEST.groups
- test/hotspot/jtreg/runtime/SharedArchiveFile/DefaultUseWithClient.java
- test/hotspot/jtreg/runtime/appcds/SharedArchiveFile.java
- test/hotspot/jtreg/runtime/appcds/UseAppCDS.java
- test/hotspot/jtreg/runtime/constantPool/ACCModule52.java
- test/hotspot/jtreg/runtime/constantPool/ConstModule.java

Changeset: 675e7b5c537f
Author:    shade
Date:      2018-05-03 10:02 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/675e7b5c537f

Fix gc/epsilon/TestMemoryMXBeans failures after the merge

! test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java

Changeset: 54c1aa06c1d8
Author:    shade
Date:      2018-05-03 11:59 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/54c1aa06c1d8

Epsilon should use Elastic TLABs facility to control sizes

! src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp
! src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+ src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
! src/hotspot/share/gc/epsilon/epsilon_globals.hpp