Update to jdk-18.0.2 release

Update release notes to 18.0.2 Drop JDK-8282004 patch which is now upstreamed under JDK-8282231 Exclude x86 where java_arches is undefined, in order to unbreak build
2022-07-22 09:25:03 +01:00 · 2022-07-22 09:25:03 +01:00 · c9b6c1b9f0
parent e7bdf2e86c
commit c9b6c1b9f0
5 changed files with 164 additions and 37 deletions
--- a/.gitignore
+++ b/.gitignore
@ -27,3 +27,4 @@
 /openjdk-jdk18u-jdk-18.0.1+0.tar.xz
 /openjdk-jdk18u-jdk-18.0.1+10.tar.xz
 /openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz
+/openjdk-jdk18u-jdk-18.0.2+9.tar.xz
--- a/147
+++ b/147
@ -3,6 +3,153 @@ Key:
 JDK-X  - https://bugs.openjdk.java.net/browse/JDK-X
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY

+New in release OpenJDK 18.0.2 (2022-07-19):
+===========================================
+Live versions of these release notes can be found at:
+  * https://builds.shipilev.net/backports-monitor/release-notes-18.0.2.txt
+
+* Security fixes
+  - JDK-8272243: Improve DER parsing
+  - JDK-8272249: Better properties of loaded Properties
+  - JDK-8277608: Address IP Addressing
+  - JDK-8281859, CVE-2022-21540: Improve class compilation
+  - JDK-8281866, CVE-2022-21541: Enhance MethodHandle invocations
+  - JDK-8282676: Improve subject handling
+  - JDK-8283190: Improve MIDI processing
+  - JDK-8284370: Improve zlib usage
+  - JDK-8285407, CVE-2022-34169: Improve Xalan supports
+* Other changes
+  - JDK-8240903: Add test to check that jmod hashes are reproducible
+  - JDK-8256368: Avoid repeated upcalls into Java to re-resolve MH/VH linkers/invokers
+  - JDK-8270480: Better path to expressing Xpaths
+  - JDK-8271008: appcds/*/MethodHandlesAsCollectorTest.java  tests time out because of excessive GC (CodeCache GC Threshold) in loom
+  - JDK-8271055: Crash during deoptimization with "assert(bb->is_reachable()) failed: getting result from unreachable basicblock" with -XX:+VerifyStack
+  - JDK-8272493: Suboptimal code generation around Preconditions.checkIndex intrinsic with AVX2
+  - JDK-8274524: SSLSocket.close() hangs if it is called during the ssl handshake
+  - JDK-8275337: C1: assert(false) failed: live_in set of first block must be empty
+  - JDK-8277055: Assert "missing inlining msg" with -XX:+PrintIntrinsics
+  - JDK-8277072: ObjectStreamClass caches keep ClassLoaders alive
+  - JDK-8277893: Arraycopy stress tests
+  - JDK-8278065: Refactor subclassAudits to use ClassValue
+  - JDK-8278381: [GCC 11] Address::make_raw() does not initialize rspec
+  - JDK-8278549: UNIX sun/font coding misses SUSE distro detection on recent distro SUSE 15
+  - JDK-8278794: Infinite loop in DeflaterOutputStream.finish()
+  - JDK-8279219: [REDO] C2 crash when allocating array of size too large
+  - JDK-8279668: x86: AVX2 versions of vpxor should be asserted
+  - JDK-8279822: CI: Constant pool entries in error state are not supported
+  - JDK-8279958: Provide configure hints for Alpine/apk package managers
+  - JDK-8280041: Retry loop issues in java.io.ClassCache
+  - JDK-8280476: [macOS] : hotspot arm64 bug exposed by latest clang
+  - JDK-8280600: C2: assert(!had_error) failed: bad dominance
+  - JDK-8280674: Bump version numbers for July CPU
+  - JDK-8280799: С2: assert(false) failed: cyclic dependency prevents range check elimination
+  - JDK-8280867: Cpuid1Ecx feature parsing is incorrect for AMD CPUs
+  - JDK-8280901: MethodHandle::linkToNative stub is missing w/ -Xint
+  - JDK-8280956: Re-examine copyright headers on files in src/java.desktop/macosx/native/libawt_lwawt/awt/a11y
+  - JDK-8281168: Micro-optimize VarForm.getMemberName for interpreter
+  - JDK-8281181: Do not use CPU Shares to compute active processor count
+  - JDK-8281266: [JVMCI] MetaUtil.toInternalName() doesn't handle hidden classes correctly
+  - JDK-8281274: deal with ActiveProcessorCount in os::Linux::print_container_info
+  - JDK-8281318: Improve jfr/event/allocation tests reliability
+  - JDK-8281544: assert(VM_Version::supports_avx512bw()) failed for Tests jdk/incubator/vector/
+  - JDK-8281615: Deadlock caused by jdwp agent
+  - JDK-8281638: jfr/event/allocation tests fail with release VMs after JDK-8281318 due to lack of -XX:+UnlockDiagnosticVMOptions
+  - JDK-8281771: Crash in java_lang_invoke_MethodType::print_signature
+  - JDK-8281811: assert(_base == Tuple) failed: Not a Tuple after JDK-8280799
+  - JDK-8281822: Test failures on non-DTrace builds due to incomplete DTrace* flags handling
+  - JDK-8282042: [testbug] FileEncodingTest.java depends on default encoding
+  - JDK-8282045: When loop strip mining fails, safepoints are removed from loop anyway
+  - JDK-8282080: Lambda deserialization fails for Object method references on interfaces
+  - JDK-8282170: JVMTI SetBreakpoint metaspace allocation test
+  - JDK-8282172: CompileBroker::log_metaspace_failure is called from non-Java/compiler threads
+  - JDK-8282194: C1: Missing side effects of dynamic constant linkage
+  - JDK-8282219: jdk/java/lang/ProcessBuilder/Basic.java fails on AIX
+  - JDK-8282225: GHA: Allow one concurrent run per PR only
+  - JDK-8282231: x86-32: runtime call to SharedRuntime::ldiv corrupts registers
+  - JDK-8282295: SymbolPropertyEntry::set_method_type fails with assert
+  - JDK-8282300: Throws NamingException instead of InvalidNameException after JDK-8278972
+  - JDK-8282312: Minor corrections to evbroadcasti32x4 intrinsic on x86
+  - JDK-8282444: Module finder incorrectly assumes default file system path-separator character
+  - JDK-8282551: Properly initialize L32X64MixRandom state
+  - JDK-8282583: Update BCEL md to include the copyright notice
+  - JDK-8282590: C2: assert(addp->is_AddP() && addp->outcnt() > 0) failed: Don't process dead nodes
+  - JDK-8282592: C2: assert(false) failed: graph should be schedulable
+  - JDK-8282628: Potential memory leak in sun.font.FontConfigManager.getFontConfig()
+  - JDK-8282874: Bad performance on gather/scatter API caused by different IntSpecies of indexMap
+  - JDK-8282887: Potential memory leak in sun.util.locale.provider.HostLocaleProviderAdapterImpl.getNumberPattern() on Windows
+  - JDK-8282929: Localized monetary symbols are not reflected in `toLocalizedPattern` return value
+  - JDK-8283017: GHA: Workflows break with update release versions
+  - JDK-8283022: com/sun/crypto/provider/Cipher/AEAD/GCMBufferTest.java failing with -Xcomp after 8273297
+  - JDK-8283037: Update jdk18u fix version to 18.0.2
+  - JDK-8283187: C2: loop candidate for superword not always unrolled fully if superword fails
+  - JDK-8283217: Leak FcObjectSet in getFontConfigLocations() in fontpath.c
+  - JDK-8283379: Memory leak in FileHeaderHelper
+  - JDK-8283408: Fix a C2 crash when filling arrays with unsafe
+  - JDK-8283422: Create a new test for JDK-8254790
+  - JDK-8283451: C2: assert(_base == Long) failed: Not a Long
+  - JDK-8283469: Don't use memset to initialize members in FileMapInfo and fix memory leak
+  - JDK-8283555: G1: Concurrent mark accesses uninitialized BOT of closed archive regions
+  - JDK-8283641: Large value for CompileThresholdScaling causes assert
+  - JDK-8283725: Launching java with "-Xlog:gc*=trace,safepoint*=trace,class*=trace" crashes the JVM
+  - JDK-8284012: Correction version-numbers.conf after merge
+  - JDK-8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo
+  - JDK-8284033: Leak XVisualInfo in getAllConfigs in awt_GraphicsEnv.c
+  - JDK-8284094: Memory leak in invoker_completeInvokeRequest()
+  - JDK-8284369: TestFailedAllocationBadGraph fails with -XX:TieredStopAtLevel < 4
+  - JDK-8284389: Improve stability of GHA Pre-submit testing by caching cygwin installer
+  - JDK-8284458: CodeHeapState::aggregate() leaks blob_name
+  - JDK-8284507: GHA: Only check test results if testing was not skipped
+  - JDK-8284532: Memory leak in BitSet::BitMapFragmentTable in JFR leak profiler
+  - JDK-8284549: JFR: FieldTable leaks FieldInfoTable member
+  - JDK-8284620: CodeBuffer may leak _overflow_arena
+  - JDK-8284622: Update versions of some Github Actions used in JDK workflow
+  - JDK-8284808: change milestone to fcs for releases: jdk-11.0.16, jdk-17.0.4, jdk-18.0.2
+  - JDK-8284848: C2: Compiler blackhole arguments should be treated as globally escaping
+  - JDK-8284866: Add test to JDK-8273056
+  - JDK-8284992: Fix misleading Vector API doc for LSHR operator
+  - JDK-8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()
+  - JDK-8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4
+  - JDK-8285517: System.getenv() returns unexpected value if environment variable has non ASCII character
+  - JDK-8285523: Improve test java/io/FileOutputStream/OpenNUL.java
+  - JDK-8285686: Upgrade to FreeType 2.12.0
+  - JDK-8285828: runtime/execstack/TestCheckJDK.java fails with zipped debug symbols
+  - JDK-8285921: serviceability/dcmd/jvmti/AttachFailed/AttachReturnError.java fails on Alpine
+  - JDK-8285956: (fs) Excessive default poll interval in PollingWatchService
+  - JDK-8286013: Incorrect test configurations for compiler/stable/TestStableShort.java
+  - JDK-8286029: Add classpath exemption to globals_vectorApiSupport_***.S.inc
+  - JDK-8286198: [linux] Fix process-memory information
+  - JDK-8286283: assert(func2 == 0 && func3 == 0) failed: not unary
+  - JDK-8286444: javac errors after JDK-8251329 are not helpful enough to find root cause
+  - JDK-8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups
+  - JDK-8286601: Mac Aarch: Excessive warnings to be ignored for build jdk
+  - JDK-8286855: javac error on invalid jar should only print filename
+  - JDK-8287119: Add Distrust.java to ProblemList
+  - JDK-8287162: (zipfs) Performance regression related to support for POSIX file permissions
+  - JDK-8287175: Backout 8270480: Better path to expressing Xpaths
+  - JDK-8287202: GHA: Add macOS aarch64 to the list of default platforms for workflow_dispatch event
+  - JDK-8287336: GHA: Workflows break on patch versions
+  - JDK-8287378: GHA: Update cygwin to fix issues in langtools tests on Windows
+  - JDK-8287644: [18u] Backport of JDK-8240903 causes test errors
+
+Notes on individual issues:
+===========================
+
+hotspot/runtime:
+
+JDK-8288367: CPU Shares Ignored When Computing Active Processor Count
+=====================================================================
+Previous JDK releases used an incorrect interpretation of the Linux
+cgroups parameter cpu.shares". This might cause the JVM to use fewer
+CPUs than available, leading to an under utilization of CPU resources
+when the JVM is used inside a container.
+
+Starting from this JDK release, by default, the JVM no longer
+considers "cpu.shares" when deciding the number of threads to be used
+by the various thread pools. The `-XX:+UseContainerCpuShares`
+command-line option can be used to revert to the previous
+behavior. This option is deprecated and may be removed in a future JDK
+release.
+
 New in release OpenJDK 18.0.1.1 (2022-04-22):
 =============================================
 * Other changes
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@ -310,8 +310,8 @@
 # New Version-String scheme-style defines
 %global featurever 18
 %global interimver 0
-%global updatever 1
-%global patchver 1
+%global updatever 2
+%global patchver 0
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
@ -367,8 +367,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        2
-%global rpmrelease      8
+%global buildver        9
+%global rpmrelease      1
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@ -486,7 +486,11 @@
 %endif

 # x86 is no longer supported
+%if 0%{?java_arches:1}
 ExclusiveArch:  %{java_arches}
+%else
+ExcludeArch: %{ix86}
+%endif

 # not-duplicated scriptlets for normal/debug packages
 %global update_desktop_icons /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@ -1406,8 +1410,6 @@ Patch1001: fips-18u-%{fipsver}.patch
 # OpenJDK patches in need of upstreaming
 #
 #############################################
-# JDK-8282004: x86_32.ad rules that call SharedRuntime helpers should have CALL effects
-Patch7: jdk8282004-x86_32-missing_call_effects.patch

 BuildRequires: autoconf
 BuildRequires: automake
@ -1821,7 +1823,6 @@ pushd %{top_level_dir_name}
 %patch2 -p1
 %patch3 -p1
 %patch6 -p1
-%patch7 -p1
 # Add crypto policy and FIPS support
 %patch1001 -p1
 # alt-java
@ -2625,6 +2626,12 @@ cjc.mainProgram(args)
 %endif

 %changelog
+* Fri Jul 22 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.2.0.9-1.rolling
+- Update to jdk-18.0.2 release
+- Update release notes to 18.0.2
+- Drop JDK-8282004 patch which is now upstreamed under JDK-8282231
+- Exclude x86 where java_arches is undefined, in order to unbreak build
+
 * Fri Jul 22 2022 Jiri Vanek <gnu.andrew@redhat.com> - 1:18.0.1.1.2-8.rolling
 - moved to build only on %%{java_arches}
 -- https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
@ -2635,7 +2642,7 @@ cjc.mainProgram(args)
 -- Replaced binaries and .so files with bash-stubs on i686
 - added ExclusiveArch:  %%{java_arches}
 -- this now excludes i686
-- this is safely backport-able to older fedoras, as the macro was  backported proeprly (with i686 included)
+-- this is safely backport-able to older fedoras, as the macro was backported properly (with i686 included)
 - https://bugzilla.redhat.com/show_bug.cgi?id=2104125

 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:18.0.1.1.2-7.rolling.1
--- a/jdk8282004-x86_32-missing_call_effects.patch
+++ b/jdk8282004-x86_32-missing_call_effects.patch
@ -1,28 +0,0 @@
-diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad
-index a31a38a384f..6138ca5281f 100644
--- a/src/hotspot/cpu/x86/x86_32.ad
-+++ b/src/hotspot/cpu/x86/x86_32.ad
-@@ -7825,9 +7825,9 @@ instruct divI_eReg(eAXRegI rax, eDXRegI rdx, eCXRegI div, eFlagsReg cr) %{
- %}
- 
- // Divide Register Long
-instruct divL_eReg( eADXRegL dst, eRegL src1, eRegL src2, eFlagsReg cr, eCXRegI cx, eBXRegI bx ) %{
-+instruct divL_eReg(eADXRegL dst, eRegL src1, eRegL src2) %{
-   match(Set dst (DivL src1 src2));
-  effect( KILL cr, KILL cx, KILL bx );
-+  effect(CALL);
-   ins_cost(10000);
-   format %{ "PUSH   $src1.hi\n\t"
-             "PUSH   $src1.lo\n\t"
-@@ -7873,9 +7873,9 @@ instruct modI_eReg(eDXRegI rdx, eAXRegI rax, eCXRegI div, eFlagsReg cr) %{
- %}
- 
- // Remainder Register Long
-instruct modL_eReg( eADXRegL dst, eRegL src1, eRegL src2, eFlagsReg cr, eCXRegI cx, eBXRegI bx ) %{
-+instruct modL_eReg(eADXRegL dst, eRegL src1, eRegL src2) %{
-   match(Set dst (ModL src1 src2));
-  effect( KILL cr, KILL cx, KILL bx );
-+  effect(CALL);
-   ins_cost(10000);
-   format %{ "PUSH   $src1.hi\n\t"
-             "PUSH   $src1.lo\n\t"
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz) = 183ff4b1c4b501edd2c2a436a093f9d99ec0df86046ca3ac26d7f44981d72d3036baa1f8b6036288edb6c6fc637468a80e9ea55dffdc1d18b61a237660e103b3
+SHA512 (openjdk-jdk18u-jdk-18.0.2+9.tar.xz) = 08b06407deb4a13f36b29738b8038c7b2ce953eb526abe732fb4a256d968511c9ef705c5d568b4b3c98867665b748e331c9f293e69fc13bea1eed6879b6095d0