OpenJDK / jdk / hs
changeset 46556:beb2c322626d
8182729: [AOT] remove UseConcMarkSweepGC check when loading libraries
Reviewed-by: kvn
| author | twisti |
|---|---|
| date | Thu, 22 Jun 2017 13:59:00 -0700 |
| parents | 5ada291c5063 |
| children | eb30f7891bae 13de3946d61e |
| files | hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java hotspot/src/share/vm/aot/aotCodeHeap.cpp hotspot/src/share/vm/aot/aotCodeHeap.hpp |
| diffstat | 4 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java Thu Jun 22 18:33:41 2017 +0200 +++ b/hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java Thu Jun 22 13:59:00 2017 -0700 @@ -308,7 +308,6 @@ graalHotSpotVMConfig.useCompressedClassPointers, graalHotSpotVMConfig.compactFields, graalHotSpotVMConfig.useG1GC, - graalHotSpotVMConfig.useCMSGC, graalHotSpotVMConfig.useTLAB, graalHotSpotVMConfig.useBiasedLocking, TieredAOT.getValue(graalOptions),
--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Thu Jun 22 18:33:41 2017 +0200 +++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Thu Jun 22 13:59:00 2017 -0700 @@ -212,7 +212,6 @@ } public final boolean useG1GC = getFlag("UseG1GC", Boolean.class); - public final boolean useCMSGC = getFlag("UseConcMarkSweepGC", Boolean.class); public final int allocatePrefetchStyle = getFlag("AllocatePrefetchStyle", Integer.class); public final int allocatePrefetchInstr = getFlag("AllocatePrefetchInstr", Integer.class);
--- a/hotspot/src/share/vm/aot/aotCodeHeap.cpp Thu Jun 22 18:33:41 2017 +0200 +++ b/hotspot/src/share/vm/aot/aotCodeHeap.cpp Thu Jun 22 13:59:00 2017 -0700 @@ -152,7 +152,6 @@ verify_flag(_config->_useCompressedOops, UseCompressedOops, "UseCompressedOops"); verify_flag(_config->_useCompressedClassPointers, UseCompressedClassPointers, "UseCompressedClassPointers"); verify_flag(_config->_useG1GC, UseG1GC, "UseG1GC"); - verify_flag(_config->_useCMSGC, UseConcMarkSweepGC, "UseConcMarkSweepGC"); verify_flag(_config->_useTLAB, UseTLAB, "UseTLAB"); verify_flag(_config->_useBiasedLocking, UseBiasedLocking, "UseBiasedLocking"); verify_flag(_config->_objectAlignment, ObjectAlignmentInBytes, "ObjectAlignmentInBytes");
--- a/hotspot/src/share/vm/aot/aotCodeHeap.hpp Thu Jun 22 18:33:41 2017 +0200 +++ b/hotspot/src/share/vm/aot/aotCodeHeap.hpp Thu Jun 22 13:59:00 2017 -0700 @@ -88,7 +88,8 @@ } AOTHeader; typedef struct { - enum { CONFIG_SIZE = 12 + 7 * 4 }; + enum { CONFIG_SIZE = 7 * jintSize + 11 }; + // 7 int values int _config_size; int _narrowOopShift; int _narrowKlassShift; @@ -102,7 +103,6 @@ bool _useCompressedClassPointers; bool _compactFields; bool _useG1GC; - bool _useCMSGC; bool _useTLAB; bool _useBiasedLocking; bool _tieredAOT;