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

*** 53,11 ***
  
      @Override
      public Object get(Object obj) throws IllegalArgumentException {
          try {
              return isStatic() ? getter.invokeExact() : getter.invokeExact(obj);
!         } catch (IllegalArgumentException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              throw newGetIllegalArgumentException(obj);
          } catch (Throwable e) {
              throw new InternalError(e);
--- 53,11 ---
  
      @Override
      public Object get(Object obj) throws IllegalArgumentException {
          try {
              return isStatic() ? getter.invokeExact() : getter.invokeExact(obj);
!         } catch (IllegalArgumentException|IllegalStateException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              throw newGetIllegalArgumentException(obj);
          } catch (Throwable e) {
              throw new InternalError(e);

*** 106,11 ***
              if (isStatic()) {
                  setter.invokeExact(value);
              } else {
                  setter.invokeExact(obj, value);
              }
!         } catch (IllegalArgumentException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              // already ensure the receiver type.  So this CCE is due to the value.
              throwSetIllegalArgumentException(value);
          } catch (Throwable e) {
--- 106,11 ---
              if (isStatic()) {
                  setter.invokeExact(value);
              } else {
                  setter.invokeExact(obj, value);
              }
!         } catch (IllegalArgumentException|IllegalStateException|NullPointerException e) {
              throw e;
          } catch (ClassCastException e) {
              // already ensure the receiver type.  So this CCE is due to the value.
              throwSetIllegalArgumentException(value);
          } catch (Throwable e) {