RFR: Merge jdk-17-ga [v2]
Man Cao
manc at openjdk.org
Mon Mar 11 19:38:00 UTC 2024
On Mon, 11 Mar 2024 19:33:56 GMT, Jiangli Zhou <jiangli at openjdk.org> wrote:
>> This is a redo of https://github.com/openjdk/tsan/pull/16 to address the commits issue. Updated description:
>>
>> Command: $ git merge --no-ff jdk-17-ga
>>
>> Most manual merge for conflicts are mechanical.
>>
>> Additional manual updates:
>>
>> Add #include "memory/resourceArea.hpp" in src/hotspot/share/tsan/tsanOopMap.cpp to resolve compiler error:
>> tsanOopMap.cpp:351:5: error: use of undeclared identifier 'ResourceMark'; did you mean 'ResourceStack'?
>> ResourceMark rm;
>> ^~~~~~~~~~~~
>> ResourceStack
>>
>> Remove AMD64_ONLY(assert((id_u8 & left_n_bits(17)) == 0, "jmethodID is not aligned");) in classFileParser.cpp. left_n_bits has been removed by https://bugs.openjdk.org/browse/JDK-8178348
>>
>> Change obj_field_addr_raw<oop>() to field_addr() in java_lang_Class::init_lock_addr in javaClasses.cpp.
>>
>> Remove ShenandoahTSANWeakRoot::ShenandoahTSANWeakRoot as ShenandoahWeakSerialRoot is removed in shenandoahRootProcessor.cpp.
>>
>> Remove JVMWrapper calls in tsan related functions in jvm.cpp. The macro has been removed.
>>
>> Change to use current for JRT_ENTRY(void, SharedRuntime::tsan_interp_method_entry(JavaThread* thread)) as JRT_ENTRY macro expects current, sharedRuntime.cpp.
>>
>> Change THREAD to current in synchronizer.cpp.
>>
>> Updated test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c to merge JDK-8272472 change to avoid build failure for testing.
>>
>> Tested by running hotspot/jtreg/tsan locally:
>>
>>
>> $ bash configure --with-boot-jdk=/usr/local/google/home/jianglizhou/openjdk/jdk-17.0.10 --with-debug-level=release --disable-warnings-as-errors --with-jtreg=/usr/local/google/home/jianglizhou/github/jtreg/build/images/jtreg --with-stdc++lib=static --disable-precompiled-headers --enable-unlimited-crypto --with-native-debug-symbols=internal --with-default-make-target=jdk-image --disable-warnings-as-errors --with-toolchain-type=clang --with-toolchain-path=/usr/local/google/home/jianglizhou/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-18.04 --disable-warnings-as-errors
>>
>> $ make test TEST=hotspot/jtreg/tsan
>>
>> Tsan is not fully functional with jdk-17 merge. New runs found more random failures in addition to tsan/NonRacySyncBlockExceptionLoopTest.java. The failed tests appear to be inconsistent, but tsan/NonRacyGarbageCollectionLoopTest.java is more consistently failing. The test failures most likely is because there is no longer serial iterator for the TsanOopMap.
>>
>> Also built and tested using Clang/LLVM 16.0.6. It appears to be working with jdk...
>
> Jiangli Zhou has updated the pull request incrementally with one additional commit since the last revision:
>
> Update to address manc@'s review comments.
Marked as reviewed by manc (Reviewer).
-------------
PR Review: https://git.openjdk.org/tsan/pull/17#pullrequestreview-1907662069
More information about the tsan-dev
mailing list