On Tue, 20 Oct 2020 15:33:59 GMT, Richard Reingruber <rr...@openjdk.org> wrote:
>>> Hi, >>> >>> this is a good change, because it is a simplification and it it makes the >>> stack walks safe by doing them as part of a >>> handshake. >>> The change conflicts with #119 though. This one is ready to be pushed since >>> last week but was delayed due to other >>> interferences. Would you mind me integrating #119 first? After integration >>> it would be needed to pull 2 EscapeBarriers >>> out of handshakes. Of course I would help do that. Thanks, Richard. >> >> Hey Richard, go ahead and integrate your 119 first, I'll hold off and do the >> merge once you integrated. > >> >> >> > Hi, >> > this is a good change, because it is a simplification and it it makes the >> > stack walks safe by doing them as part of a >> > handshake. The change conflicts with #119 though. This one is ready to be >> > pushed since last week but was delayed due to >> > other interferences. Would you mind me integrating #119 first? After >> > integration it would be needed to pull 2 >> > EscapeBarriers out of handshakes. Of course I would help do that. Thanks, >> > Richard. >> >> Hey Richard, go ahead and integrate your 119 first, I'll hold off and do the >> merge once you integrated. > > Thanks Robbin! Hi Robbin, for merging master after integration of #119 I'd suggest to resolve the conflicts by chosing the alternative from this pr and then apply https://github.com/reinrich/jdk/commit/6fa91e344ed5bf6d877e3f5a2d0d1920591fd441 (is there a more elegant way to propose a patch?) I successfully tested make run-test TEST=test/jdk/com/sun/jdi/EATests.java which also covers PopFrame and ForceEarlyReturn. More tests are running. For night tests of our team it is unfortunately too late. Thanks, Richard. ------------- PR: https://git.openjdk.java.net/jdk/pull/729
