openjdk/jdk16u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk16u.git synced 2025-12-10 14:50:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Rob McKenna 2021-05-18 14:21:00 +00:00
commit 6fc68c2fbb
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View File

@ -151,6 +151,7 @@ jint ShenandoahHeap::initialize() {
Universe::check_alignment(init_byte_size, reg_size_bytes, "Shenandoah heap");
_num_regions = ShenandoahHeapRegion::region_count();
assert(_num_regions == (max_byte_size / reg_size_bytes), "Must match");
// Now we know the number of regions, initialize the heuristics.
initialize_heuristics();

2
src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
View File

@ -573,7 +573,7 @@ void ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
RegionSizeBytesMask = RegionSizeBytes - 1;
guarantee(RegionCount == 0, "we should only set it once");
RegionCount = max_heap_size / RegionSizeBytes;
RegionCount = align_up(max_heap_size, RegionSizeBytes) / RegionSizeBytes;
guarantee(RegionCount >= MIN_NUM_REGIONS, "Should have at least minimum regions");
guarantee(HumongousThresholdWords == 0, "we should only set it once");

5
src/java.base/share/conf/security/java.security
View File

@ -633,8 +633,7 @@ sun.security.krb5.maxReferrals=5
#
#
jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \
RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224, \
SHA1 jdkCA & usage SignedJAR & denyAfter 2019-01-01
RSA keySize < 1024, DSA keySize < 1024, EC keySize < 224
#
# Legacy algorithms for certification path (CertPath) processing and
@ -698,7 +697,7 @@ jdk.security.legacyAlgorithms=SHA1, \
# See "jdk.certpath.disabledAlgorithms" for syntax descriptions.
#
jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
DSA keySize < 1024, SHA1 jdkCA & denyAfter 2019-01-01
DSA keySize < 1024
#
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security

2
src/utils/LogCompilation/pom.xml
View File

@ -42,7 +42,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>

2
test/lib-test/sun/hotspot/whitebox/CPUInfoTest.java
View File

@ -62,7 +62,7 @@ public class CPUInfoTest {
"avx512bw", "avx512vl", "sha", "fma",
"vzeroupper", "avx512_vpopcntdq", "avx512_vpclmulqdq", "avx512_vaes",
"avx512_vnni", "clflush", "clflushopt", "clwb",
"avx512_vmbi2", "avx512_vmbi", "hv"
"avx512_vbmi2", "avx512_vbmi", "hv"
);
// @formatter:on
// Checkstyle: resume