infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-11 02:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

8182729: [AOT] remove UseConcMarkSweepGC check when loading libraries

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Christian Thalinger 2017-06-22 13:59:00 -07:00
parent c0a589deba
commit ec241eb2a4
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java
View File

@ -308,7 +308,6 @@ public class BinaryContainer implements SymbolTable {
graalHotSpotVMConfig.useCompressedClassPointers,
graalHotSpotVMConfig.compactFields,
graalHotSpotVMConfig.useG1GC,
graalHotSpotVMConfig.useCMSGC,
graalHotSpotVMConfig.useTLAB,
graalHotSpotVMConfig.useBiasedLocking,
TieredAOT.getValue(graalOptions),

1
hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
View File

@ -212,7 +212,6 @@ public class GraalHotSpotVMConfig extends HotSpotVMConfigAccess {
}
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);

1
hotspot/src/share/vm/aot/aotCodeHeap.cpp
View File

@ -152,7 +152,6 @@ void AOTLib::verify_config() {
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");

4
hotspot/src/share/vm/aot/aotCodeHeap.hpp
View File

@ -88,7 +88,8 @@ typedef struct {
} 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 @@ typedef struct {
bool _useCompressedClassPointers;
bool _compactFields;
bool _useG1GC;
bool _useCMSGC;
bool _useTLAB;
bool _useBiasedLocking;
bool _tieredAOT;