[lworld] Integrated: Merge jdk

David Simms dsimms at openjdk.java.net
Mon Aug 24 12:44:00 UTC 2020


Merge tag 'jdk-16+6' into lworld_merge_jdk_16_6
Added tag jdk-16+6 for changeset 4a8fd81d64ba

# Conflicts:
#	src/hotspot/cpu/aarch64/aarch64.ad
#	src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/runtime/globals.hpp

-------------

Commit messages:
 - Merge tag 'jdk-16+6' into lworld_merge_jdk_16_6
 - 8247677: Incorrect class name displayed in DriverManager trace output
 - Merge
 - 8242891: vmTestbase/nsk/jvmti/ test should be fixed to fail early if JVMTI function return error
 - Merge
 - 8249036: clean up FileInstaller $test.src $cwd in vmTestbase_nsk_stress tests
 - 8249032: clean up FileInstaller $test.src $cwd in vmTestbase_nsk_sysdict tests
 - 8249035: clean up FileInstaller $test.src $cwd in vmTestbase_nsk_jdwp tests
 - 8249028: clean up FileInstaller $test.src $cwd in vmTestbase_nsk_monitoring tests
 - 8249033: clean up FileInstaller $test.src $cwd in vmTestbase_vm_metaspace tests
 - ... and 89 more: https://git.openjdk.java.net/valhalla/compare/cd5c75f8...f606d475

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - lworld: https://webrevs.openjdk.java.net/valhalla/164/webrev.00.0
 - jdk: https://webrevs.openjdk.java.net/valhalla/164/webrev.00.1

Changes: https://git.openjdk.java.net/valhalla/pull/164/files
  Stats: 10152 lines in 1959 files changed: 3509 ins; 4376 del; 2267 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/164.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/164/head:pull/164

PR: https://git.openjdk.java.net/valhalla/pull/164


More information about the valhalla-dev mailing list