Merged update from upstream sources

This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/java-11-openjdk.git#7f58eb6adf071f9f2660fb9093a45d4c62697b77
2021-01-15 12:16:00 +00:00 · 2021-01-15 12:16:00 +00:00 · 947d295af9
commit 947d295af9
parent 33ebc08a1c
6 changed files with 150 additions and 52 deletions
--- a/.gitignore
+++ b/.gitignore
@ -71,3 +71,8 @@
 /jdk-updates-jdk11u-jdk-11.0.9+10-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.9+11-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.10+1-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.10+2-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.10+3-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.10+4-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.10+5-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.10+8-4curve.tar.xz
--- a/121
+++ b/121
@ -10,10 +10,15 @@ Live versions of these release notes can be found at:
  * https://builds.shipilev.net/backports-monitor/release-notes-11.0.10.txt

 * Other changes
+  - JDK-6722928: Support SSPI as a native GSS-API provider
  - JDK-7185258: [macosx] Deadlock in SunToolKit.realSync()
  - JDK-8152332: [macosx] JFileChooser cannot be serialized on Mac OS X
  - JDK-8161684: [testconf] Add VerifyOops' testing into compiler tiers
+  - JDK-8171279: Support X25519 and X448 in TLS
+  - JDK-8173361: various crashes in JvmtiExport::post_compiled_method_load
+  - JDK-8173658: JvmtiExport::post_class_unload() is broken for non-JavaThread initiators
  - JDK-8191006: hsdis disassembler plugin does not compile with binutils 2.29+
+  - JDK-8197981: Missing return statement in __sync_val_compare_and_swap_8
  - JDK-8198334: java/awt/FileDialog/8003399/bug8003399.java fails in headless mode
  - JDK-8200151: Add 8 JNDI tests to com/sun/jndi/dns/ConfigTests/
  - JDK-8208279: Add 8 JNDI tests to com/sun/jndi/dns/EnvTests/
@ -22,25 +27,47 @@ Live versions of these release notes can be found at:
  - JDK-8208665: Amend cross-compilation docs with qemu-debootstrap recipe
  - JDK-8210088: ProblemList gc/epsilon/TestMemoryMXBeans.java
  - JDK-8210339: Add 10 JNDI tests to com/sun/jndi/dns/FedTests/
+  - JDK-8211450: UndetVar::dup is not copying the kind field to the duplicated instance
+  - JDK-8212160: JVMTI agent crashes with "assert(_value != 0LL) failed: resolving NULL _value"
  - JDK-8212226: SurfaceManager throws "Invalid Image variant" for MultiResolutionImage (Windows)
  - JDK-8213400: Support choosing group name in keytool keypair generation
  - JDK-8213535: Windows HiDPI html lightweight tooltips are truncated
  - JDK-8213698: Improve devkit creation and add support for linux/ppc64/ppc64le/s390x
+  - JDK-8214025: assert(t->singleton()) failed: must be a constant when ScavengeRootsInCode < 2
+  - JDK-8214242: compiler/arguments/TestScavengeRootsInCode.java fails because of missing UnlockDiagnosticVMOptions
+  - JDK-8214787: Zero builds fail with "undefined JavaThread::thread_state()"
+  - JDK-8215583: Exclude runtime/handshake/HandshakeWalkSuspendExitTest.java
  - JDK-8216012: Infinite loop in RSA KeyPairGenerator
  - JDK-8216324: GetClassMethods is confused by the presence of default methods in super interfaces
  - JDK-8217429: WebSocket over authenticating proxy fails to send Upgrade headers
  - JDK-8217976: test/jdk/java/net/httpclient/websocket/WebSocketProxyTest.java fails intermittently
+  - JDK-8218021: Have jarsigner preserve posix permission attributes
+  - JDK-8218287: jshell tool: input behavior unstable after 12-ea+24 on Windows
  - JDK-8218851: JVM crash in custom classloader stress test, JDK 12 & 13
  - JDK-8220420: Cleanup c1_LinearScan
+  - JDK-8222072: JVMTI GenerateEvents() sends CompiledMethodLoad events to wrong jvmtiEnv
  - JDK-8222286: Fix for JDK-8213419 is broken on s390
+  - JDK-8222527: HttpClient doesn't send HOST header when tunelling HTTP/1.1 through http proxy
  - JDK-8222533: jtreg test jdk/internal/platform/cgroup/TestCgroupMetrics.java fails on SLES12.3 linux ppc64le machine
  - JDK-8224506: [TESTBUG] TestDockerMemoryMetrics.java fails with exitValue = 137
  - JDK-8224555: vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/TestDescription.java failed
+  - JDK-8224650: Add tests to support X25519 and X448 in TLS
+  - JDK-8225072: Add LuxTrust certificate that is expiring in March 2021 to list of allowed but expired certs
  - JDK-8225329: -XX:+PrintBiasedLockingStatistics causes crash during initialization on Windows platforms
+  - JDK-8225687: Newly added sspi.cpp in JDK-6722928 still contains some small errors
  - JDK-8227006: [linux] Runtime.availableProcessors execution time increased by factor of 100
+  - JDK-8227275: Within native OOM error handling, assertions may hang the process
  - JDK-8227647: [Graal] Test8009761.java fails due to "RuntimeException: static java.lang.Object compiler.uncommontrap.Test8009761.m3(boolean,boolean) not compiled"
+  - JDK-8229495: SIGILL in C2 generated OSR compilation
+  - JDK-8230910: libsspi_bridge does not build on Windows 32bit
  - JDK-8232114: JVM crashed at imjpapi.dll in native code
  - JDK-8234147: Avoid looking up standard charsets in core libraries
+  - JDK-8234393: [macos] printing ignores printer tray
+  - JDK-8234863: Increase default value of MaxInlineLevel
+  - JDK-8235218: Minimal VM is broken after JDK-8173361
+  - JDK-8235456: Minimal VM is broken after JDK-8212160
+  - JDK-8235829: graal crashes with Zombie.java test
+  - JDK-8236124: Minimal VM slowdebug build failed after JDK-8212160
  - JDK-8236512: PKCS11 Connection closed after Cipher.doFinal and NoPadding
  - JDK-8236944: The legVecZ operand should be limited to zmm0-zmm15 registers
  - JDK-8237186: Fix typo in copyright header of java/io/Reader/TransferTo.java
@ -48,8 +75,10 @@ Live versions of these release notes can be found at:
  - JDK-8237512: AArch64: aarch64TestHook leaks a BufferBlob
  - JDK-8237524: AArch64: String.compareTo() may return incorrect result
  - JDK-8237950: C2 compilation fails with "Live Node limit exceeded limit" during ConvI2L::Ideal optimization
+  - JDK-8238579: HttpsURLConnection drops the timeout and hangs forever in read
  - JDK-8239105: Add exception for expiring Digicert root certificates to VerifyCACerts test
  - JDK-8239477: jdk/jfr/jcmd/TestJcmdStartStopDefault.java fails -XX:+VerifyOops with "verify_oop: rsi: broken oop"
+  - JDK-8239497: SEGV in EdgeUtils::field_name_symbol(Edge const&)
  - JDK-8239886: Minimal VM build fails after JDK-8237499
  - JDK-8240633: Memory leaks in the implementations of FileChooserUI
  - JDK-8240690: Race condition between EDT and BasicDirectoryModel.FilesLoader.run0()
@ -63,11 +92,17 @@ Live versions of these release notes can be found at:
  - JDK-8242846: Bring back test/jdk/tools/jlink/plugins/OrderResourcesPluginTest.java
  - JDK-8243114: Implement montgomery{Multiply,Square}intrinsics on Windows
  - JDK-8243290: Improve diagnostic messages for class verification and redefinition failures
+  - JDK-8243488: Add tests for set/get SendBufferSize and getReceiveBufferSize in DatagramSocket
+  - JDK-8243549: sun/security/ssl/CipherSuite/NamedGroupsWithCipherSuite.java failed with Unsupported signature algorithm: DSA
  - JDK-8243617: compiler/onSpinWait/TestOnSpinWaitC1.java test uses wrong class
  - JDK-8243619: compiler/codecache/CheckSegmentedCodeCache.java test misses -version
  - JDK-8244142: some hotspot/runtime tests don't check exit code of forked JVM
  - JDK-8244278: Excessive code cache flushes and sweeps
+  - JDK-8244282: test/hotspot/jtreg/compiler/intrinsics/Test8237524.java fails with --illegal-access=deny
+  - JDK-8244621: [macos10.15] Garbled FX printing plus CoreText warnings on Catalina when building with Xcode 11
  - JDK-8244819: hsdis does not compile with binutils 2.34+
+  - JDK-8245051: c1 is broken if it is compiled by gcc without -fno-lifetime-dse
+  - JDK-8245168: jlink should not be treated as a "small" tool
  - JDK-8245400: Upgrade to LittleCMS 2.11
  - JDK-8246381: VM crashes with "Current BasicObjectLock* below than low_mark"
  - JDK-8246434: Threads::print_on_error assumes that the heap has been set up
@ -93,38 +128,77 @@ Live versions of these release notes can be found at:
  - JDK-8249607: C2: assert(!had_error) failed: bad dominance
  - JDK-8249608: Vector register used by C2 compiled method corrupted at safepoint
  - JDK-8249672: Include microcode revision in features_string on x86
+  - JDK-8249748: gtest silently ignores bad jvm arguments
  - JDK-8249821: Separate libharfbuzz from libfontmanager
  - JDK-8250598: Hyper-V is detected in spite of running on host OS
  - JDK-8250605: Linux x86_32 builds fail after JDK-8249821
+  - JDK-8250636: iso8601_time returns incorrect offset part on MacOS
  - JDK-8250665: Wrong translation for the month name of May in ar_JO,LB,SY
  - JDK-8250772: Test com/sun/jndi/ldap/NamingExceptionMessageTest.java fails intermittently with javax.naming.ServiceUnavailableException
+  - JDK-8250825: C2 crashes with assert(field != __null) failed: missing field
  - JDK-8250894: Provide a configure option to build and run against the platform libharfbuzz
  - JDK-8250928: JFR: Improve hash algorithm for stack traces
+  - JDK-8250968: Symlinks attributes not preserved when using jarsigner on zip files
+  - JDK-8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities
  - JDK-8251118: BiasedLocking::preserve_marks should not have a HandleMark
  - JDK-8251189: com/sun/jndi/ldap/LdapDnsProviderTest.java failed due to timeout
+  - JDK-8251257: NMT: jcmd VM.native_memory scale=1 crashes target VM
+  - JDK-8251365: Build failure on AIX after 8250636
  - JDK-8251397: NPE on ClassValue.ClassValueMap.cacheArray
  - JDK-8251456: [TESTBUG] compiler/vectorization/TestVectorsNotSavedAtSafepoint.java failed OutOfMemoryError
  - JDK-8251458: Parse::do_lookupswitch fails with "assert(_cnt >= 0) failed"
+  - JDK-8251535: Partial peeling at unsigned test adds incorrect loop exit check
  - JDK-8251949: ZGC: Set explicit heap size for compiler/gcbarriers tests
  - JDK-8252090: JFR: StreamWriterHost::write_unbuffered() stucks in an infinite loop OpenJDK (build 13.0.1+9)
  - JDK-8252415: Bump update version for OpenJDK: jdk-11.0.10
  - JDK-8252470: java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java fails on Windows
  - JDK-8252497: Incorrect numeric currency code for ROL
  - JDK-8252660: Shenandoah: support manageable SoftMaxHeapSize option
+  - JDK-8252679: Two windows specific FileDIalog tests may fail on some Windows_Server_2016_Standard
  - JDK-8252696: Loop unswitching may cause out of bound array load to be executed
  - JDK-8252754: Hash code calculation of JfrStackTrace is inconsistent
+  - JDK-8253219: Epsilon: clean up unnecessary includes
  - JDK-8253224: Shenandoah: ShenandoahStrDedupQueue destructor calls virtual num_queues()
  - JDK-8253226: Shenandoah: remove unimplemented ShenandoahStrDedupQueue::verify
+  - JDK-8253269: The CheckCommonColors test should provide more info on failure
  - JDK-8253284: Zero OrderAccess barrier mappings are incorrect
  - JDK-8253375: OSX build fails with Xcode 12.0 (12A7209)
  - JDK-8253778: ShenandoahSafepoint::is_at_shenandoah_safepoint should not access VMThread state from other threads
  - JDK-8253791: Issue with useAppleColor check in CSystemColors.m
+  - JDK-8254016: Test8237524 fails with -XX:-CompactStrings option
  - JDK-8254081: java/security/cert/PolicyNode/GetPolicyQualifiers.java fails due to an expired certificate
+  - JDK-8254144: Non-x86 Zero builds fail with return-type warning in os_linux_zero.cpp
  - JDK-8254166: Zero: return-type warning in zeroInterpreter_zero.cpp
  - JDK-8254177: (tz) Upgrade time-zone data to tzdata2020b
  - JDK-8254185: Fix Code cache sweeper heuristics for JDK 11
  - JDK-8254190: [s390] interpreter misses exception check after calling monitorenter
  - JDK-8254790: SIGSEGV in string_indexof_char and stringL_indexof_char intrinsics
+  - JDK-8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations
+  - JDK-8254982: (tz) Upgrade time-zone data to tzdata2020c
+  - JDK-8255050: Add pkcs11/KeyStore/ClientAuth.sh to Problem list
+  - JDK-8255065: Zero: accessor_entry misses the IRIW case
+  - JDK-8255226: (tz) Upgrade time-zone data to tzdata2020d
+  - JDK-8255269: Unsigned overflow in g1Policy.cpp
+  - JDK-8255365: Problem list failing client manual tests
+  - JDK-8255457: Shenandoah: cleanup ShenandoahMarkTask
+  - JDK-8255466: C2 crashes at ciObject::get_oop() const+0x0
+  - JDK-8255550: x86: Assembler::cmpq(Address dst, Register src) encoding is incorrect
+  - JDK-8255603: Memory/Performance regression after JDK-8210985
+  - JDK-8255760: Shenandoah: match constants style in ShenandoahMarkTask fallback
+  - JDK-8255937: Better cleanup for test/jdk/javax/imageio/stream/StreamFlush.java
+  - JDK-8256427: Test com/sun/jndi/dns/ConfigTests/PortUnreachable.java does not work on AIX
+  - JDK-8256452: Integrate missing part of JDK-8232370 to 11u
+  - JDK-8256483: [TESTBUG] serviceability/jvmti/GetClassMethods/libOverpassMethods.c fails to compile on gcc 4.4.x
+  - JDK-8256557: libharfbuzz fails to link on gcc 4.4.x due to -Wl,-z,defs
+  - JDK-8256618: Zero: Linux x86_32 build still fails
+  - JDK-8256736: Zero: GTest tests fail with "unsuppported vm variant"
+  - JDK-8256809: Annotation processing causes NPE during flow analysis
+  - JDK-8257181: s390x builds are very noisy with gc-sections messages
+  - JDK-8257242: [macOS] Java app crashes while switching input methods
+  - JDK-8257545: SunJSSE FIPS regression in key exchange after JDK-8171279 11u backport
+  - JDK-8257641: Shenandoah: Query is_at_shenandoah_safepoint() from control thread should return false
+  - JDK-8257701: Shenandoah: objArrayKlass metadata is not marked with chunked arrays
+  - JDK-8258630: Add expiry exception for QuoVadis root certificate

 Notes on individual issues:
 ===========================
@ -140,6 +214,53 @@ generate an EC key pair by using the `secp384r1` curve. Because there
 might be multiple curves with the same size, using the `-groupname`
 option is preferred over the `-keysize` option.

+JDK-8248263: jarsigner Preserves POSIX File Permission and symlink Attributes
+=============================================================================
+When signing a file that contains POSIX file permission or symlink
+attributes, `jarsigner` now preserves these attributes in the newly
+signed file but warns that these attributes are unsigned and not
+protected by the signature. The same warning is printed during the
+`jarsigner -verify` operation for such files.
+
+Note that the `jar` tool does not read/write these attributes. This
+change is more visible to tools like `unzip` where these attributes
+are preserved.
+
+security-libs/javax.net.ssl:
+
+JDK-8225764:  Support for X25519 and X448 in TLS
+================================================
+
+The named elliptic curve groups `x25519` and `x448` are now available
+for JSSE key agreement in TLS versions 1.0 to 1.3, with `x25519` being
+the most preferred of the default enabled named groups.  The default
+ordered list is now:
+
+* x25519
+* secp256r1
+* secp384r1
+* secp521r1
+* x448
+* secp256k1
+* ffdhe2048
+* ffdhe3072
+* ffdhe4096
+* ffdhe6144
+* ffdhe8192
+
+The default list can be overridden using the system property *`jdk.tls.namedGroups`*.
+
+security-libs/org.ietf.jgss:
+
+JDK-8214079: Added a Default Native GSS-API Library on Windows
+==============================================================
+A native GSS-API library has been added to JDK on the Windows
+platform. The library is client-side only and uses the default
+credentials. It will be loaded when the `sun.security.jgss.native`
+system property is set to "true". A user can still load a third-party
+native GSS-API library by setting the system property
+`sun.security.jgss.lib` to its path.
+
 New in release OpenJDK 11.0.9.1 (2020-10-20):
 =============================================
 Live versions of these release notes can be found at:
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@ -4,7 +4,7 @@
 # Example:
 # When used from local repo set REPO_ROOT pointing to file:// with your repo
 # If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
-# If you want to use a local copy of patch PR3802, set the path to it in the PR3802 variable
+# If you want to use a local copy of patch PR3818, set the path to it in the PR3818 variable
 #
 # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
 # PROJECT_NAME=jdk
@ -26,9 +26,9 @@
 # level folder, name is created, based on parameter
 #

-if [ ! "x$PR3802" = "x" ] ; then
-  if [ ! -f "$PR3802" ] ; then
-    echo "You have specified PR3802 as $PR3802 but it does not exist. Exiting"
+if [ ! "x$PR3818" = "x" ] ; then
+  if [ ! -f "$PR3818" ] ; then
+    echo "You have specified PR3818 as $PR3818 but it does not exist. Exiting"
    exit 1
  fi
 fi
@ -48,7 +48,7 @@ if [ "x$1" = "xhelp" ] ; then
    echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
    echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
    echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
-    echo "PR3802 - the path to the PR3802 patch to apply (optional; downloaded if unavailable)"
+    echo "PR3818 - the path to the PR3818 patch to apply (optional; downloaded if unavailable)"
    exit 1;
 fi

@ -126,17 +126,17 @@ pushd "${FILE_NAME_ROOT}"
 	    rm -vf ${CRYPTO_PATH}/ecp_224.c

            echo "Syncing EC list with NSS"
-            if [ "x$PR3802" = "x" ] ; then
-                # get pr3802.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag
+            if [ "x$PR3818" = "x" ] ; then
+                # get pr3818.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag
                # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3751)
-		echo "PR3802 not found. Downloading..."
-		wget http://icedtea.classpath.org/hg/icedtea11/raw-file/tip/patches/pr3802-4curve.patch
-	        echo "Applying ${PWD}/pr3802.patch"
-		patch -Np1 < pr3802.patch
-		rm pr3802.patch
+		echo "PR3818 not found. Downloading..."
+		wget http://icedtea.classpath.org/hg/icedtea11/raw-file/tip/patches/pr3818-4curve.patch
+	        echo "Applying ${PWD}/pr3818.patch"
+		patch -Np1 < pr3818.patch
+		rm pr3818.patch
 	    else
-		echo "Applying ${PR3802}"
-		patch -Np1 < $PR3802
+		echo "Applying ${PR3818}"
+		patch -Np1 < $PR3818
            fi;
            find . -name '*.orig' -exec rm -vf '{}' ';'
        popd
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@ -47,7 +47,7 @@
 %global debug_on with full debugging on
 %global fastdebug_on with minimal debugging on
 %global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
-%global for_fastdebug_on for packages with minimal debugging on
+%global for_fastdebug for packages with minimal debugging on
 %global for_debug for packages with debugging on

 %if %{with release}
@ -285,7 +285,7 @@
 %global origin          openjdk
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
-%global buildver        1
+%global buildver        8
 %global rpmrelease      0
 #%%global tagsuffix      ""
 # 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
@ -1180,8 +1180,6 @@ Patch7: pr3695-toggle_system_crypto_policy.patch
 # able to be removed once that release is out
 # and used by this RPM.
 #############################################
-# JDK-8250861: Crash in MinINode::Ideal(PhaseGVN*, bool)
-Patch10: jdk8250861-crash_in_MinINode_Ideal.patch

 BuildRequires: autoconf
 BuildRequires: automake
@ -1228,6 +1226,7 @@ BuildRequires: gcc >= 4.8.3-8
 %if %{with_systemtap}
 BuildRequires: systemtap-sdt-devel
 %endif
+BuildRequires: make

 # this is always built, also during debug-only build
 # when it is built in debug-only this package is just placeholder
@ -1526,7 +1525,6 @@ pushd %{top_level_dir_name}
 %patch3 -p1
 %patch4 -p1
 %patch7 -p1
-%patch10 -p1
 popd # openjdk

 %patch1000
@ -2166,6 +2164,12 @@ require "copy_jdk_configs.lua"
 %endif

 %changelog
+* Thu Jan 14 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.10.0.8-0.0.ea
+- Update to jdk-11.0.10.0+8
+- Update release notes to 11.0.10.0+8.
+- Update tarball generation script to use PR3818 which handles JDK-8171279 changes
+- Drop JDK-8250861 as applied upstream.
+
 * Tue Dec 22 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:11.0.10.0.1-0.0.ea
 - Update to jdk-11.0.10.0+1
 - Update release notes to 11.0.10.0+1
--- a/jdk8250861-crash_in_MinINode_Ideal.patch
+++ b/jdk8250861-crash_in_MinINode_Ideal.patch
@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User thartmann
-# Date 1604482955 -3600
-# Node ID 27723943c0dd65a191cbefe031cec001521e4b13
-# Parent  e9d90c9daf895b469b461b727b6887e7780b4ac2
-8250861: Crash in MinINode::Ideal(PhaseGVN*, bool)
-Summary: Added missing NULL checks.
-Reviewed-by: kvn, chagedorn
-
-diff -r e9d90c9daf89 -r 27723943c0dd src/hotspot/share/opto/addnode.cpp
--- a/src/hotspot/share/opto/addnode.cpp	Mon Nov 02 20:20:05 2020 +0100
-+++ b/src/hotspot/share/opto/addnode.cpp	Wed Nov 04 10:42:35 2020 +0100
-@@ -917,7 +917,7 @@
- 
-     // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z)
-     // if x == y and the additions can't overflow.
-    if (phase->eqv(x,y) &&
-+    if (phase->eqv(x,y) && tx != NULL &&
-         !can_overflow(tx, x_off) &&
-         !can_overflow(tx, y_off)) {
-       return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2));
-@@ -925,7 +925,7 @@
-   } else {
-     // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1)
-     // if x == y and the additions can't overflow.
-    if (phase->eqv(x,y) &&
-+    if (phase->eqv(x,y) && tx != NULL &&
-         !can_overflow(tx, x_off) &&
-         !can_overflow(tx, y_off)) {
-       return new AddINode(x,phase->intcon(MIN2(x_off,y_off)));
-
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (jdk-updates-jdk11u-jdk-11.0.10+1-4curve.tar.xz) = 6217deaf76a9fe314f7ab2b7255b93d35ef32f68ebf7b2000a6526c04bc7ecf28dc08c77bb27f221872ee19e4cbd8a1f44dc45f3b3b8c660e226fd9ce47b4d01
+SHA512 (jdk-updates-jdk11u-jdk-11.0.10+8-4curve.tar.xz) = 8b5c8d8f3a1c558e0487c9af1cb910983540a2e3595757bd7126af2cc5dbaccd55b5b94ce8a86ef3dd9b11f917f553e3d0e5408bced008745c9d8274908b44e1