[8u] RFR Backport of 8067429: java.lang.VerifyError: Inconsistent stackmap frames at branch target

[Andrew John Hughes]

On 16/09/2019 15:12, Andrew Leonard wrote:
> Thanks Andrew,
> I'll try unshuffle_patch next time, that sounds useful, would have saved
> me time!
> Cheers
> Andrew
> 
> Andrew Leonard
> Java Runtimes Development
> IBM Hursley
> IBM United Kingdom Ltd
> internet email: andrew_m_leonard at uk.ibm.com
> 
> 

It doesn't always work, as the paths may not match the database it uses,
but it's usually worth a try.

If the patch is from a later version, you may need to run it through
multiple versions of the script from different repos. For the most
common case of going from 11u to 8u (the two active update versions), I
usually have to run the 11u unshuffle script
(jdk11/bin/unshuffle_patch.sh) to move things back into the multi-repo
structure of 9 and earlier, and then the 9 one way to use the old paths
to the source files, prior to modularisation.

It's a pain, but my main point was that, if path changes are enough to
make hg import cleanly apply the patch on 8u, you don't need to ask for
a review, just approval of the shuffled patch :)

Hope that helps,
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222
https://keybase.io/gnu_andrew