src/java.base/share/classes/java/lang/reflect/Method.java

*** 24,10 ***
--- 24,11 ---
   */
  
  package java.lang.reflect;
  
  import jdk.internal.access.SharedSecrets;
+ import jdk.internal.value.PrimitiveClass;
  import jdk.internal.misc.VM;
  import jdk.internal.reflect.CallerSensitive;
  import jdk.internal.reflect.CallerSensitiveAdapter;
  import jdk.internal.reflect.MethodAccessor;
  import jdk.internal.reflect.Reflection;

*** 129,10 ***
--- 130,11 ---
             int slot,
             String signature,
             byte[] annotations,
             byte[] parameterAnnotations,
             byte[] annotationDefault) {
+         assert PrimitiveClass.isPrimaryType(declaringClass);
          this.clazz = declaringClass;
          this.name = name;
          this.parameterTypes = parameterTypes;
          this.returnType = returnType;
          this.exceptionTypes = checkedExceptions;

*** 418,17 ***
      }
  
      @Override
      void specificToStringHeader(StringBuilder sb) {
          sb.append(getReturnType().getTypeName()).append(' ');
!         sb.append(getDeclaringClass().getTypeName()).append('.');
          sb.append(getName());
      }
  
      @Override
      String toShortString() {
!         return "method " + getDeclaringClass().getTypeName() +
                  '.' + toShortSignature();
      }
  
      String toShortSignature() {
          StringJoiner sj = new StringJoiner(",", getName() + "(", ")");
--- 420,17 ---
      }
  
      @Override
      void specificToStringHeader(StringBuilder sb) {
          sb.append(getReturnType().getTypeName()).append(' ');
!         sb.append(getDeclaringClassTypeName()).append('.');
          sb.append(getName());
      }
  
      @Override
      String toShortString() {
!         return "method " + getDeclaringClassTypeName() +
                  '.' + toShortSignature();
      }
  
      String toShortSignature() {
          StringJoiner sj = new StringJoiner(",", getName() + "(", ")");

*** 487,11 ***
  
      @Override
      void specificToGenericStringHeader(StringBuilder sb) {
          Type genRetType = getGenericReturnType();
          sb.append(genRetType.getTypeName()).append(' ');
!         sb.append(getDeclaringClass().getTypeName()).append('.');
          sb.append(getName());
      }
  
      /**
       * Invokes the underlying method represented by this {@code Method}
--- 489,11 ---
  
      @Override
      void specificToGenericStringHeader(StringBuilder sb) {
          Type genRetType = getGenericReturnType();
          sb.append(genRetType.getTypeName()).append(' ');
!         sb.append(getDeclaringClassTypeName()).append('.');
          sb.append(getName());
      }
  
      /**
       * Invokes the underlying method represented by this {@code Method}