RFR: 8349070: Fix riscv and ppc build errors caused by JDK-8343767

[Andrew Dinn]

On Thu, 30 Jan 2025 14:03:11 GMT, Julian Waters <jwaters at openjdk.org> wrote:

>> 8349070: Fix riscv and ppc build errors caused by JDK-8343767
>
> Wow, this is a particularly bad one, I've never seen merge conflict markers end up inside the codebase before. Not my area of expertise but this is simple enough for me to understand and review

@TheShermanTanker 
> Wow, this is a particularly bad one, I've never seen merge conflict markers end up inside the codebase before. Not my area of expertise but this is simple enough for me to understand and review

I was wondering why the bot does not check for and reject commits that include merge markers. Then when I grepped the sources and test sources I realised that there are lots of 'legitimate' occurrences of them in comments and strings.

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

PR Comment: https://git.openjdk.org/jdk/pull/23368#issuecomment-2624620672