We just need to run the `generate-vh-tests.sh` to fix the conflicts. The templates have `// -- This file was mechanically generated: Do not edit! -- //` warning but it might have been not obvious enough.
Testing: the 3 tests ------------- Commit messages: - 8378087 Changes: https://git.openjdk.org/valhalla/pull/2126/files Webrev: https://webrevs.openjdk.org/?repo=valhalla&pr=2126&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8378087 Stats: 237 lines in 4 files changed: 22 ins; 31 del; 184 mod Patch: https://git.openjdk.org/valhalla/pull/2126.diff Fetch: git fetch https://git.openjdk.org/valhalla.git pull/2126/head:pull/2126 PR: https://git.openjdk.org/valhalla/pull/2126
