RFR: Merge lworld

David Simms dsimms at openjdk.java.net
Thu Feb 25 08:23:17 UTC 2021


Merge tag 'jdk-17+11'

# Conflicts:
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/classFileParser.hpp
#	src/hotspot/share/oops/instanceKlass.hpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java

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

Commit messages:
 - Merge branch 'lworld' into type-restrictions_merge_lworld_17_11
 - Merge jdk
 - 8254001: [Metrics] Enhance parsing of cgroup interface files for version detection
 - 8262315: missing ';' in generated entities
 - 8258855: Two tests sun/security/krb5/auto/ReplayCacheTestProc.java and ReplayCacheTestProcWithMD5.java failed on OL8.3
 - 8261919: java/util/Locale/LocaleProvidersRun.java failed with "RuntimeException: Expected log was not emitted. LogRecord: null"
 - 8261920: [AIX] jshell command throws java.io.IOError on non English locales
 - 8262259: Remove unused variable in MethodLiveness::BasicBlock::compute_gen_kill_single
 - 8262027: Improve how HttpConnection detects a closed channel when taking/returning a connection to the pool
 - 8256438: AArch64: Implement match rules with ROR shift register value
 - ... and 107 more: https://git.openjdk.java.net/valhalla/compare/75d27907...94ce3695

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - type-restrictions: https://webrevs.openjdk.java.net/?repo=valhalla&pr=352&range=00.0
 - lworld: https://webrevs.openjdk.java.net/?repo=valhalla&pr=352&range=00.1

Changes: https://git.openjdk.java.net/valhalla/pull/352/files
  Stats: 16586 lines in 429 files changed: 11608 ins; 2624 del; 2354 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/352.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/352/head:pull/352

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


More information about the valhalla-dev mailing list