Missing methods should throw NSME

Author: liach

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
-import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.GenericDeclaration;
 import java.lang.reflect.GenericSignatureFormatError;
 import java.lang.reflect.InvocationTargetException;
@@ -1471,7 +1470,7 @@ public Method getEnclosingMethod() {
                 }
             }
 
-            throw new InternalError("Enclosing method not found");
+            throw new NoSuchMethodError(enclosingCandidate.getName() + "." + enclosingInfo.getName() + enclosingInfo.getDescriptor());
         }
     }
 
@@ -1544,12 +1543,6 @@ String getDescriptor() {
         }
     }
 
-    private static Class<?> toClass(Type o) {
-        if (o instanceof GenericArrayType gat)
-            return toClass(gat.getGenericComponentType()).arrayType();
-        return (Class<?>)o;
-     }
-
     /**
      * If this {@code Class} object represents a local or anonymous
      * class within a constructor, returns a {@link
@@ -1593,7 +1586,7 @@ public Constructor<?> getEnclosingConstructor() {
                 }
             }
 
-            throw new InternalError("Enclosing constructor not found");
+            throw new NoSuchMethodError(enclosingCandidate.getName() + "." + enclosingInfo.getName() + enclosingInfo.getDescriptor());
         }
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,6 +168,10 @@ public AnnotatedType getAnnotatedType() {
      * component
      */
     public Method getAccessor() {
+        if (accessor == null) {
+            // Hotspot passes null for "not found" accessors
+            throw new NoSuchMethodError(getDeclaringRecord().getName() + "." + getName());
+        }
         return accessor;
     }
 

test/jdk/java/lang/Class/getEnclosingMethod/BadEnclosingMethodTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8350704
+ * @bug 8350704 8381377
  * @summary Test behaviors with various bad EnclosingMethod attribute
  * @library /test/lib
  * @run junit BadEnclosingMethodTest
@@ -111,7 +111,7 @@ void testMalformedTypes() throws Exception {
      * valid, but refers to a class or interface that cannot be found.
      */
     @Test
-    void testAbsentMethods() throws Exception {
+    void testAbsentTypeInMethods() throws Exception {
         var absentMethodType = loadTestClass("methodName", "(Ldoes/not/Exist;)V");
         var ex = assertThrows(TypeNotPresentException.class,
                 absentMethodType::getEnclosingMethod);
@@ -122,8 +122,29 @@ void testAbsentMethods() throws Exception {
                 absentConstructorType::getEnclosingConstructor);
         assertEquals("does.not.Exist", ex.typeName());
     }
+
+    /**
+     * Test reflective behaviors when the EnclosingMethod attribute uses valid
+     * class and method names and types, but the method does not exist.
+     */
+    @Test
+    void testAbsentMethods() throws Exception {
+        var absentMethodType = loadTestClass("work", "(I)V");
+        var ex = assertThrows(NoSuchMethodError.class,
+                absentMethodType::getEnclosingMethod);
+        var message = ex.getMessage();
+        assertTrue(message.contains("Encloser.work(I)V"));
+
+        var absentConstructorType = loadTestClass(INIT_NAME, "(I)V");
+        ex = assertThrows(NoSuchMethodError.class,
+                absentConstructorType::getEnclosingConstructor);
+        message = ex.getMessage();
+        assertTrue(message.contains("Encloser.<init>(I)V"));
+    }
+
 }
 
+// These guys are compiled to serve as templates for bytecode transformation
 class Encloser {
     private static void work() {
         class Enclosed {

test/jdk/java/lang/reflect/records/IsRecordTest.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8255560
+ * @bug 8255560 8381377
  * @summary Class::isRecord should check that the current class is final and not abstract
  * @library /test/lib
  * @run junit/othervm IsRecordTest
@@ -156,6 +156,25 @@ final class B { }
         assertNull(B.class.getRecordComponents());
     }
 
+    /** Tests record component behavior with missing accessors. */
+    @Test
+    public void testMissingAccessor() throws Exception {
+        var missingAccessorBytes = generateClassBytes("MissingAccessor", true, false, "java/lang/Record", List.of(RecordComponentInfo.of("x", CD_int)));
+        var missingAccessor = ByteCodeLoader.load("MissingAccessor", missingAccessorBytes);
+
+        assertTrue(missingAccessor.isRecord());
+        assertEquals(1, missingAccessor.getRecordComponents().length);
+
+        var component = missingAccessor.getRecordComponents()[0];
+        assertEquals("x", component.getName());
+        assertSame(int.class, component.getType());
+        assertSame(int.class, component.getGenericType());
+        assertNull(component.getGenericSignature());
+        var nsme = assertThrows(NoSuchMethodError.class, () -> component.getAccessor());
+        var message = nsme.getMessage();
+        assertTrue(message.contains("MissingAccessor.x"), message);
+    }
+
     // --  infra
 
     // Generates a class with the given properties.