From manc at openjdk.org  Mon Aug 28 18:28:23 2023
From: manc at openjdk.org (Man Cao)
Date: Mon, 28 Aug 2023 18:28:23 GMT
Subject: RFR: Merge jdk-15-ga
Message-ID: <yBSxExZiV-2ZS0Iv0rohFBazgDBU4ejQCvx_H2FeNw8=.7c5ca9ad-dfa3-4146-a629-151f0ac46d57@github.com>

Hi all,

This PR is for a merge, and to demonstrate that non-Committer could help on merging/syncing via PRs.

Most significant merge conflicts are in hotspot.m4, and those changes have been moved to jvm-features.m4.
Tested with TSAN jtreg tests with LLVM 8.0.

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

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

Commit messages:
 - Merge tag 'jdk-15-ga' into tsan
 - 8246031: SSLSocket.getSession() doesn't close connection for timeout/ interrupts
 - 8251276: JDK-8248299 breaks JDK 15 validate-headers build
 - 8248299: two jdeps files miss copyright header
 - Added tag jdk-15+35 for changeset fd60c3146a02
 - 8249628: Remove EA from JDK 15 version string starting with Initial RC promotion
 - 8250609: C2 crash in IfNode::fold_compares
 - 8248597: [Graal] api/java_security/SignatureSpi/DelegationTests.html fails with Method "javasoft.sqe.tests.api.java.security.SignatureSpi.JCKSignatureSpi.clear" doesn't exist
 - 8250770: Net.java translateToSocketException does not handle IOException
 - Added tag jdk-15+34 for changeset b0817631d2f4
 - ... and 1861 more: https://git.openjdk.org/tsan/compare/5b22e180...47419566

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - tsan: https://webrevs.openjdk.org/?repo=tsan&pr=15&range=00.0
 - jdk-15-ga: https://webrevs.openjdk.org/?repo=tsan&pr=15&range=00.1

Changes: https://git.openjdk.org/tsan/pull/15/files
  Stats: 2291107 lines in 15764 files changed: 1010028 ins; 1225411 del; 55668 mod
  Patch: https://git.openjdk.org/tsan/pull/15.diff
  Fetch: git fetch https://git.openjdk.org/tsan.git pull/15/head:pull/15

PR: https://git.openjdk.org/tsan/pull/15

From manc at openjdk.org  Thu Aug 31 01:51:54 2023
From: manc at openjdk.org (Man Cao)
Date: Thu, 31 Aug 2023 01:51:54 GMT
Subject: RFR: Merge jdk-15-ga
In-Reply-To: <yBSxExZiV-2ZS0Iv0rohFBazgDBU4ejQCvx_H2FeNw8=.7c5ca9ad-dfa3-4146-a629-151f0ac46d57@github.com>
References: <yBSxExZiV-2ZS0Iv0rohFBazgDBU4ejQCvx_H2FeNw8=.7c5ca9ad-dfa3-4146-a629-151f0ac46d57@github.com>
Message-ID: <mt4atpzeFcc00eojS5izvkKbPQkueYVoa5_25NqkG5E=.bafafa8b-9583-4abc-8dc0-82459361cdef@github.com>

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