src/java.base/share/classes/jdk/internal/reflect/MethodHandleShortFieldAccessorImpl.java

*** 72,11 ***
              if (isStatic()) {
                  return (short) getter.invokeExact();
              } else {
                  return (short) getter.invokeExact(obj);
              }
!         } catch (IllegalArgumentException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              throw newGetIllegalArgumentException(obj);
          } catch (Throwable e) {
              throw new InternalError(e);
--- 72,11 ---
              if (isStatic()) {
                  return (short) getter.invokeExact();
              } else {
                  return (short) getter.invokeExact(obj);
              }
!         } catch (IllegalArgumentException|IllegalStateException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              throw newGetIllegalArgumentException(obj);
          } catch (Throwable e) {
              throw new InternalError(e);

*** 151,11 ***
              if (isStatic()) {
                  setter.invokeExact(s);
              } else {
                  setter.invokeExact(obj, s);
              }
!         } catch (IllegalArgumentException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              // receiver is of invalid type
              throw newSetIllegalArgumentException(obj);
          } catch (Throwable e) {
--- 151,11 ---
              if (isStatic()) {
                  setter.invokeExact(s);
              } else {
                  setter.invokeExact(obj, s);
              }
!         } catch (IllegalArgumentException|IllegalStateException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              // receiver is of invalid type
              throw newSetIllegalArgumentException(obj);
          } catch (Throwable e) {