hg: jdk/sandbox: 2 new changesets

[ashipile at redhat.com]

Changeset: 76d86de267b9
Author:    shade
Date:      2018-04-18 09:46 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/76d86de267b9

Merge

! src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
! src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
! src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
! src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
! src/hotspot/cpu/s390/stubGenerator_s390.cpp
! src/hotspot/cpu/s390/templateTable_s390.cpp
! src/hotspot/cpu/sparc/stubGenerator_sparc.cpp
! src/hotspot/cpu/sparc/templateTable_sparc.cpp
! src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
! src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/c1/c1_LIRGenerator.cpp
- src/hotspot/share/gc/cms/vmStructs_parNew.hpp
- src/hotspot/share/gc/g1/g1_globals.cpp
! src/hotspot/share/gc/shared/barrierSet.hpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/gc/shared/gcArguments.cpp
- src/hotspot/share/memory/binaryTreeDictionary.cpp
- src/hotspot/share/memory/freeList.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/opto/graphKit.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/commandLineFlagConstraintsGC.cpp
- src/hotspot/share/runtime/commandLineFlagConstraintsGC.hpp
! src/hotspot/share/runtime/commandLineFlagRangeList.cpp
! src/hotspot/share/runtime/commandLineFlagWriteableList.cpp
! src/hotspot/share/runtime/globals.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/globals_extension.hpp
! src/hotspot/share/utilities/vmError.cpp
- src/java.desktop/share/classes/com/sun/awt/AWTUtilities.java
- src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
- src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
! test/hotspot/jtreg/TEST.groups
- test/hotspot/jtreg/runtime/6626217/Test6626217.sh
- test/hotspot/jtreg/runtime/6626217/many_loader1.java.foo
- test/hotspot/jtreg/runtime/6626217/many_loader2.java.foo
- test/langtools/tools/javac/diags/examples/PreviewPlural/Bar.java
- test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/Bar.java
- test/langtools/tools/javac/diags/examples/PreviewPluralAdditional/PreviewPluralAdditional.java

Changeset: a628f1855f4c
Author:    shade
Date:      2018-04-18 10:07 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/a628f1855f4c

Fix Epsilon after the merges

! src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp
! src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp
! src/hotspot/share/gc/epsilon/epsilonHeap.cpp
! src/hotspot/share/gc/shared/gc_globals.hpp