git: openjdk/jdk21u-dev: master: 2 new changesets

[Martin Doerr]

Changeset: 8991255f
Author:    Martin Doerr <mdoerr at openjdk.org>
Date:      2024-06-06 08:23:20 +0000
URL:       https://git.openjdk.org/jdk21u-dev/commit/8991255fa016ad16d556c827e2cbe4cac7f22c48

8326734: text-decoration applied to <span> lost when mixed with <u> or <s>
8325620: HTMLReader uses ConvertAction instead of specified CharacterAction for <b>, <i>, <u>

Backport-of: cd3e4c03661f770ebeefcd3637d56589243ac0a9

! src/java.desktop/share/classes/javax/swing/text/html/CSS.java
! src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
! src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java
! src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+ test/jdk/javax/swing/text/html/HTMLDocument/HTMLStrikeOnly.java
+ test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecoration.java
+ test/jdk/javax/swing/text/html/HTMLDocument/HTMLUnderlineOnly.java
! test/jdk/javax/swing/text/html/HTMLDocument/HTMLUnderlineStrike.java

Changeset: d7c73262
Author:    Martin Doerr <mdoerr at openjdk.org>
Date:      2024-06-06 08:23:47 +0000
URL:       https://git.openjdk.org/jdk21u-dev/commit/d7c73262b5c1610145afa6150918ec74381aedfe

8331885: C2: meet between unloaded and speculative types is not symmetric

Backport-of: 7652f9811bfddf08650b0c3277012074873deade

! src/hotspot/share/opto/type.cpp
! src/hotspot/share/opto/type.hpp
! test/hotspot/jtreg/compiler/runtime/unloaded/TestMHUnloaded.java