RFR: Merge jdk-15-ga

Man Cao manc at openjdk.org
Thu Aug 31 01:51:54 UTC 2023


On Sat, 26 Aug 2023 06:59:30 GMT, Man Cao <manc at openjdk.org> wrote:

> Hi all,
> 
> This PR is for a merge, and to demonstrate that non-Committer could help on merging/syncing via PRs. The merge is created with `git checkout tsan; git merge --no-ff jdk-15-ga`.
> 
> Conflicts/manual changes are:
> - Changes in make/autoconf/hotspot.m4 have been reimplemented in make/autoconf/jvm-features.m4.
> - In make/autoconf/flags-cflags.m4, `-Os` flag for clang is only applied to aarch64, but not macosx.
> - In shenandoahPhaseTimings.hpp, TSANWeakRoots needs to adapt to new format of the SHENANDOAH_PAR_PHASE_DO macro.
> - In shenandoahRootProcessor.hpp/cpp, ShenandoahTSANWeakRoot needs a new parameter in the constructor, and _tsan_weak_roots needs to be in ShenandoahSerialWeakRoots's initializer list.
> - Conflicts in the following files are trivial. They are simple changes to the patch context:
>   - src/hotspot/share/classfile/javaClasses.hpp
>   - src/hotspot/share/interpreter/templateTable.cpp
>   - src/hotspot/share/runtime/globals.hpp
>   - src/hotspot/share/runtime/init.cpp
>   - src/hotspot/share/runtime/synchronizer.cpp
> 
> Tested with TSAN jtreg tests with LLVM 8.0 (https://releases.llvm.org/download.html#8.0.1). The tests are executed via `$ make test TEST=hotspot/jtreg/tsan`.
> 
> We cannot test with LLVM 16.0, because jdk-15-ga itself does not build with LLVM 16.0. Also building bin/java with recent LLVM versions with `-fsanitizer=thread` would cause ThreadSanitizer:DEADLYSIGNAL error at run-time.
> 
> -Man

@jianglizhou I have updated the description to mention details of the resolved conflicts, as well as commands for the merge and running tests.

Could you take a look?

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

PR Comment: https://git.openjdk.org/tsan/pull/15#issuecomment-1700228276


More information about the tsan-dev mailing list