On Tue, 27 May 2025 14:17:46 GMT, Markus Grönlund <mgron...@openjdk.org> wrote:
>> Johannes Bechberger has updated the pull request incrementally with one >> additional commit since the last revision: >> >> Remove assertion > > src/hotspot/share/jfr/support/jfrThreadLocal.hpp line 36: > >> 34: #include "runtime/mutexLocker.hpp" >> 35: >> 36: #ifdef LINUX > > Can things now be fwd declared in the .hpp and includes move to the .cpp > instead? No, because I need the `timer_t` in the arguments of the methods. Or should I use a wrapper class and a pointer to it? > test/langtools/tools/javac/diags/examples/SubtypeDoesntImplementSealed.java > line 54: > >> 52: interface B3 {} >> 53: >> 54: >>>>>>>> >> bbceab072555d5e2f5d3e99ae07a5ca5e909d7dc:test/langtools/tools/javac/diags/examples/SubtypeDoesntImplementSealed.java > > merge error? good catch ------------- PR Review Comment: https://git.openjdk.org/jdk/pull/25302#discussion_r2109398525 PR Review Comment: https://git.openjdk.org/jdk/pull/25302#discussion_r2109395879