src/java.base/share/classes/java/lang/Short.java

*** 24,19 ***
   */
  
  package java.lang;
  
  import jdk.internal.misc.CDS;
  import jdk.internal.vm.annotation.IntrinsicCandidate;
  import jdk.internal.vm.annotation.Stable;
  
  import java.lang.constant.Constable;
  import java.lang.constant.DynamicConstantDesc;
  import java.util.Optional;
  
  import static java.lang.constant.ConstantDescs.BSM_EXPLICIT_CAST;
- import static java.lang.constant.ConstantDescs.CD_int;
  import static java.lang.constant.ConstantDescs.CD_short;
  import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
  
  /**
   * The {@code Short} class is the {@linkplain
--- 24,19 ---
   */
  
  package java.lang;
  
  import jdk.internal.misc.CDS;
+ import jdk.internal.value.DeserializeConstructor;
  import jdk.internal.vm.annotation.IntrinsicCandidate;
  import jdk.internal.vm.annotation.Stable;
  
  import java.lang.constant.Constable;
  import java.lang.constant.DynamicConstantDesc;
  import java.util.Optional;
  
  import static java.lang.constant.ConstantDescs.BSM_EXPLICIT_CAST;
  import static java.lang.constant.ConstantDescs.CD_short;
  import static java.lang.constant.ConstantDescs.DEFAULT_NAME;
  
  /**
   * The {@code Short} class is the {@linkplain

*** 48,20 ***
   * a {@code short} to a {@code String} and a {@code String} to a
   * {@code short}, as well as other constants and methods useful when
   * dealing with a {@code short}.
   *
   * <p>This is a <a href="{@docRoot}/java.base/java/lang/doc-files/ValueBased.html">value-based</a>
!  * class; programmers should treat instances that are
!  * {@linkplain #equals(Object) equal} as interchangeable and should not
!  * use instances for synchronization, or unpredictable behavior may
!  * occur. For example, in a future release, synchronization may fail.
   *
   * @author  Nakul Saraiya
   * @author  Joseph D. Darcy
   * @see     java.lang.Number
   * @since   1.1
   */
  @jdk.internal.ValueBased
  public final class Short extends Number implements Comparable<Short>, Constable {
  
      /**
       * A constant holding the minimum value a {@code short} can
--- 48,29 ---
   * a {@code short} to a {@code String} and a {@code String} to a
   * {@code short}, as well as other constants and methods useful when
   * dealing with a {@code short}.
   *
   * <p>This is a <a href="{@docRoot}/java.base/java/lang/doc-files/ValueBased.html">value-based</a>
!  * class; programmers should treat instances that are {@linkplain #equals(Object) equal}
!  * as interchangeable and should not use instances for synchronization, mutexes, or
!  * with {@linkplain java.lang.ref.Reference object references}.
!  *
+  * <div class="preview-block">
+  *      <div class="preview-comment">
+  *          When preview features are enabled, {@code Short} is a {@linkplain Class#isValue value class}.
+  *          Use of value class instances for synchronization, mutexes, or with
+  *          {@linkplain java.lang.ref.Reference object references} result in
+  *          {@link IdentityException}.
+  *      </div>
+  * </div>
   *
   * @author  Nakul Saraiya
   * @author  Joseph D. Darcy
   * @see     java.lang.Number
   * @since   1.1
   */
+ @jdk.internal.MigratedValueClass
  @jdk.internal.ValueBased
  public final class Short extends Number implements Comparable<Short>, Constable {
  
      /**
       * A constant holding the minimum value a {@code short} can

*** 272,10 ***
--- 281,11 ---
       * @param  s a short value.
       * @return a {@code Short} instance representing {@code s}.
       * @since  1.5
       */
      @IntrinsicCandidate
+     @DeserializeConstructor
      public static Short valueOf(short s) {
          final int offset = 128;
          int sAsInt = s;
          if (sAsInt >= -128 && sAsInt <= 127) { // must cache
              return ShortCache.cache[sAsInt + offset];