[lworld] RFR: Merge jdk

David Simms dsimms at openjdk.org
Thu Nov 16 05:58:40 UTC 2023


* Merge jdk-22+14
* @TobiHartmann solved the JDK-8314997 conflict

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

Commit messages:
 - @TobiHartmann solved the JDK-8314997 conflict
 - Merge tag 'jdk-22+14' into lworld_merge_jdk_22_14
 - 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
 - 8315689: G1: Remove unused init_hash_seed
 - 8315579: SPARC64 builds are broken after JDK-8304913
 - 8314949: linux PPC64 Big Endian: Implementation of Foreign Function & Memory API
 - 8288660: JavaDoc should be more helpful if it doesn't recognize a tag
 - 8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes?
 - 8315648: Add test for JDK-8309979 changes
 - 8315612: RISC-V: intrinsic for unsignedMultiplyHigh
 - ... and 78 more: https://git.openjdk.org/valhalla/compare/481893b8...76972900

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - lworld: https://webrevs.openjdk.org/?repo=valhalla&pr=954&range=00.0
 - jdk: https://webrevs.openjdk.org/?repo=valhalla&pr=954&range=00.1

Changes: https://git.openjdk.org/valhalla/pull/954/files
  Stats: 13586 lines in 348 files changed: 9699 ins; 2425 del; 1462 mod
  Patch: https://git.openjdk.org/valhalla/pull/954.diff
  Fetch: git fetch https://git.openjdk.org/valhalla.git pull/954/head:pull/954

PR: https://git.openjdk.org/valhalla/pull/954



More information about the valhalla-dev mailing list