[lworld] RFR: Merge jdk
David Simms
dsimms at openjdk.java.net
Wed Sep 9 09:06:12 UTC 2020
Merge tag 'jdk-16+14' into lworld_merge_jdk_16_14
Added tag jdk-16+14 for changeset 36b29df125dc
# Conflicts:
# src/hotspot/share/memory/heapInspection.cpp
# src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
-------------
Commit messages:
- Merge tag 'jdk-16+14' into lworld_merge_jdk_16_14
- 8252303: G1MMUTrackerQueue::when_sec skip queue iteration on max_gc_time pause time
- 8252093: formula used to calculate decaying variance in numberSeq
- 8252035: G1: Clean up G1CollectedHeap::*reserved* methods
- 8252231: G1AdaptiveIHOP has swapped current_occupancy and additional_buffer_size
- 8252691: Build failure after JDK-8252481
- Merge
- 8251274: Provide utilities for function SFINAE using extra template parameters
- 8252402: rewrite vmTestbase/nsk/jvmti/Allocate/alloc001 shell test to Java
- 8252532: use Utils.TEST_NATIVE_PATH instead of System.getProperty("test.nativepath")
- ... and 130 more: https://git.openjdk.java.net/valhalla/compare/31412b9f...88870b81
The webrevs contain the adjustments done while merging with regards to each parent branch:
- lworld: https://webrevs.openjdk.java.net/?repo=valhalla&pr=182&range=00.0
- jdk: https://webrevs.openjdk.java.net/?repo=valhalla&pr=182&range=00.1
Changes: https://git.openjdk.java.net/valhalla/pull/182/files
Stats: 16642 lines in 938 files changed: 10249 ins; 3403 del; 2990 mod
Patch: https://git.openjdk.java.net/valhalla/pull/182.diff
Fetch: git fetch https://git.openjdk.java.net/valhalla pull/182/head:pull/182
PR: https://git.openjdk.java.net/valhalla/pull/182
More information about the valhalla-dev
mailing list