8247569: [lworld] Align with spec for <vnew> methods

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

@@ -1677,7 +1677,7 @@ boolean isPartial() {
             return enclosingClass == null || name == null || descriptor == null;
         }
 
-        boolean isConstructor() { return !isPartial() && "<init>".equals(name); }
+        boolean isConstructor() { return !isPartial() && ("<init>".equals(name) || "<vnew>".equals(name)); }
 
         boolean isMethod() { return !isPartial() && !isConstructor() && !"<clinit>".equals(name); }
 
@@ -3840,7 +3840,7 @@ private Constructor<T> getConstructor0(Class<?>[] parameterTypes,
                 return constructor;
             }
         }
-        throw new NoSuchMethodException(methodToString("<init>", parameterTypes));
+        throw new NoSuchMethodException(methodToString(isValue() ? "<vnew>" : "<init>", parameterTypes));
     }
 
     //

src/java.base/share/classes/java/lang/constant/ConstantUtils.java

@@ -39,7 +39,7 @@ class ConstantUtils {
     static final Constable[] EMPTY_CONSTABLE = new Constable[0];
     static final int MAX_ARRAY_TYPE_DESC_DIMENSIONS = 255;
 
-    private static final Set<String> pointyNames = Set.of("<init>", "<clinit>");
+    private static final Set<String> pointyNames = Set.of("<init>", "<vnew>", "<clinit>");
 
     /**
      * Validates the correctness of a binary class name. In particular checks for the presence of

src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java

@@ -231,7 +231,7 @@ boolean isVirtualMethod() {
 
     /**
      * Returns the name of the method or field described by this nominal descriptor.
-     * For constructors, returns the reserved name {@code "<init>"}.
+     * For constructors, returns the reserved name {@code "<init>"} or {@code "<vnew>"}.
      *
      * @return the name of the method or field
      */

src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java

@@ -64,7 +64,7 @@ final class DirectMethodHandleDescImpl implements DirectMethodHandleDesc {
      */
     DirectMethodHandleDescImpl(Kind kind, ClassDesc owner, String name, MethodTypeDesc type) {
         if (kind == CONSTRUCTOR)
-            name = "<init>";
+            name = owner.isPrimitiveValueType() ? "<vnew>" : "<init>";
 
         requireNonNull(kind);
         validateClassOrInterface(requireNonNull(owner));

src/java.base/share/classes/java/lang/invoke/MemberName.java

@@ -102,7 +102,7 @@ public ClassLoader getClassLoader() {
     /** Return the simple name of this member.
      *  For a type, it is the same as {@link Class#getSimpleName}.
      *  For a method or field, it is the simple name of the member.
-     *  For a constructor, it is always {@code "<init>"}.
+     *  For a constructor, it is {@code "<init>"} or {@code "<vnew>"}.
      */
     public String getName() {
         if (name == null) {
@@ -485,7 +485,8 @@ public boolean isInlineableField()  {
         return false;
     }
 
-    static final String CONSTRUCTOR_NAME = "<init>";  // the ever-popular
+    static final String CONSTRUCTOR_NAME = "<init>";
+    static final String VALUE_FACTORY_NAME = "<vnew>";  // the ever-popular
 
     // modifiers exported by the JVM:
     // modifiers exported by the JVM:
@@ -522,9 +523,13 @@ public boolean isMethod() {
     public boolean isObjectConstructor() {
         return testAllFlags(IS_OBJECT_CONSTRUCTOR);
     }
+    /** Query whether this member is a constructor. */
+    boolean isConstructor(String name) {
+        return CONSTRUCTOR_NAME.equals(name) || VALUE_FACTORY_NAME.equals(name);
+    }
     /** Query whether this member is an object constructor or static <init> factory */
     public boolean isObjectConstructorOrStaticInitMethod() {
-        return isObjectConstructor() || (getName().equals(CONSTRUCTOR_NAME) && testAllFlags(IS_METHOD));
+        return isObjectConstructor() || (isConstructor(getName()) && isMethod());
     }
     /** Query whether this member is a field. */
     public boolean isField() {
@@ -695,7 +700,8 @@ public MemberName(Constructor<?> ctor) {
         // fill in vmtarget, vmindex while we have ctor in hand:
         MethodHandleNatives.init(this, ctor);
         assert(isResolved() && this.clazz != null);
-        this.name = CONSTRUCTOR_NAME;
+        this.name = this.clazz.isValue() ? VALUE_FACTORY_NAME
+                                          : CONSTRUCTOR_NAME;
         if (this.type == null) {
             Class<?> rtype = void.class;
             if (isStatic()) {  // a static init factory, not a true constructor
@@ -838,13 +844,13 @@ public MemberName(Class<?> defClass, String name, Class<?> type, byte refKind) {
     }
     /** Create a method or constructor name from the given components:
      *  Declaring class, name, type, reference kind.
-     *  It will be a constructor if and only if the name is {@code "<init>"}.
+     *  It will be a constructor if and only if the name is {@code "<init>"} or {@code "<vnew>"}.
      *  The declaring class may be supplied as null if this is to be a bare name and type.
      *  The last argument is optional, a boolean which requests REF_invokeSpecial.
      *  The resulting name will in an unresolved state.
      */
     public MemberName(Class<?> defClass, String name, MethodType type, byte refKind) {
-        int initFlags = (name != null && name.equals(CONSTRUCTOR_NAME) && type.returnType() == void.class ? IS_OBJECT_CONSTRUCTOR : IS_METHOD);
+        int initFlags = isConstructor(name) ? IS_OBJECT_CONSTRUCTOR : IS_METHOD;
         init(defClass, name, type, flagsMods(initFlags, 0, refKind));
         initResolved(false);
     }
@@ -864,7 +870,7 @@ public MemberName(byte refKind, Class<?> defClass, String name, Object type) {
         } else if (refKind == REF_newInvokeSpecial) {
             kindFlags = IS_OBJECT_CONSTRUCTOR;
             if (!(type instanceof MethodType) ||
-                !CONSTRUCTOR_NAME.equals(name))
+                !isConstructor(name))
                 throw newIllegalArgumentException("not a constructor type or name");
         } else {
             throw newIllegalArgumentException("bad reference kind "+refKind);

src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java

@@ -160,8 +160,8 @@ public interface MethodHandleInfo {
 
     /**
      * Returns the name of the cracked method handle's underlying member.
-     * This is {@code "<init>"} if the underlying member was a constructor,
-     * else it is a simple method name or field name.
+     * This is {@code "<init>"} or {@code "<vnew>"} if the underlying member
+     * was a constructor, else it is a simple method name or field name.
      * @return the simple name of the underlying member
      */
     public String getName();

src/java.base/share/classes/java/lang/invoke/MethodHandles.java

@@ -706,7 +706,7 @@ public static <T extends Member> T reflectAs(Class<T> expected, MethodHandle tar
      * (See the Java Virtual Machine Specification, section {@jvms 4.10.1.9}.)
      * <p>
      * The JVM represents constructors and static initializer blocks as internal methods
-     * with special names ({@code "<init>"} and {@code "<clinit>"}).
+     * with special names ({@code "<init>"}, {@code "<vnew>"} and {@code "<clinit>"}).
      * The internal syntax of invocation instructions allows them to refer to such internal
      * methods as if they were normal methods, but the JVM bytecode verifier rejects them.
      * A lookup of such an internal method will produce a {@code NoSuchMethodException}.
@@ -2599,7 +2599,7 @@ public MethodHandle findStatic(Class<?> refc, String name, MethodType type) thro
             MemberName method = resolveOrFail(REF_invokeStatic, refc, name, type);
             // resolveOrFail could return a non-static <init> method if present
             // detect and throw NSME before producing a MethodHandle
-            if (!method.isStatic() && name.equals("<init>")) {
+            if (!method.isStatic() && (name.equals("<init>") || name.equals("<vnew>"))) {
                 throw new NoSuchMethodException("illegal method name: " + name);
             }
 
@@ -2750,9 +2750,9 @@ private MethodHandle findVirtualForVH(String name, MethodType type) {
          * }
          *
          * @apiNote
-         * This method does not find a static {@code <init>} factory method as it is invoked
+         * This method does not find a static {@code <init>/<vnew>} factory method as it is invoked
          * via {@code invokestatic} bytecode as opposed to {@code invokespecial} for an
-         * object constructor.  To look up static {@code <init>} factory method, use
+         * object constructor.  To look up static {@code <init>/<vnew>} factory method, use
          * the {@link #findStatic(Class, String, MethodType) findStatic} method.
          *
          * @param refc the class or interface from which the method is accessed
@@ -2773,7 +2773,7 @@ public MethodHandle findConstructor(Class<?> refc, MethodType type) throws NoSuc
             if (type.returnType() != void.class) {
                 throw new NoSuchMethodException("Constructors must have void return type: " + refc.getName());
             }
-            String name = "<init>";
+            String name = refc.isValue() ? "<vnew>" : "<init>";
             MemberName ctor = resolveOrFail(REF_newInvokeSpecial, refc, name, type);
             return getDirectConstructor(refc, ctor);
         }
@@ -2969,7 +2969,7 @@ public Class<?> accessClass(Class<?> targetClass) throws IllegalAccessException
          * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
          * the method's variable arity modifier bit ({@code 0x0080}) is set.
          * <p style="font-size:smaller;">
-         * <em>(Note:  JVM internal methods named {@code "<init>"} are not visible to this API,
+         * <em>(Note:  JVM internal methods named {@code "<init>"/"<vnew>"} are not visible to this API,
          * even though the {@code invokespecial} instruction can refer to them
          * in special circumstances.  Use {@link #findConstructor findConstructor}
          * to access instance initialization methods in a safe manner.)</em>
@@ -3742,7 +3742,7 @@ boolean isClassAccessible(Class<?> refc) {
         void checkMethodName(byte refKind, String name) throws NoSuchMethodException {
             // "<init>" can only be invoked via invokespecial or it's a static init factory
             if (name.startsWith("<") && refKind != REF_newInvokeSpecial &&
-                    !(refKind == REF_invokeStatic && name.equals("<init>"))) {
+                    !(refKind == REF_invokeStatic && (name.equals("<init>") || name.equals("<vnew>")))) {
                     throw new NoSuchMethodException("illegal method name: " + name);
             }
         }
@@ -4018,7 +4018,7 @@ private MethodHandle getDirectMethodCommon(byte refKind, Class<?> refc, MemberNa
                 !refc.isInterface() &&
                 refc != lookupClass().getSuperclass() &&
                 refc.isAssignableFrom(lookupClass())) {
-                assert(!method.getName().equals("<init>"));  // not this code path
+                assert(!method.getName().equals("<init>") && !method.getName().equals("<vnew>"));  // not this code path
 
                 // Per JVMS 6.5, desc. of invokespecial instruction:
                 // If the method is in a superclass of the LC,

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

@@ -114,11 +114,12 @@ public ConstructorAccessor generateConstructor(Class<?> declaringClass,
                                      int modifiers,
                                      Class<?> targetConstructorClass)
     {
+        boolean isValueClass = declaringClass.isValue();
         return (SerializationConstructorAccessorImpl)
             generate(declaringClass,
-                     "<init>",
+                     isValueClass ? "<vnew>" : "<init>",
                      parameterTypes,
-                     Void.TYPE,
+                     isValueClass ? declaringClass : Void.TYPE,
                      checkedExceptions,
                      modifiers,
                      true,
@@ -185,7 +186,7 @@ private MagicAccessorImpl generate(final Class<?> declaringClass,
         // +   [CONSTANT_Class_info] for above
         // +   [UTF-8] "java/lang/InvocationTargetException"
         // +   [CONSTANT_Class_info] for above
-        // +   [UTF-8] "<init>"
+        // +   [UTF-8] "<init>" or "<vnew>"
         // +   [UTF-8] "()V"
         // +   [CONSTANT_NameAndType_info] for above
         // +   [CONSTANT_Methodref_info] for NullPointerException's constructor

src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java

@@ -139,10 +139,10 @@ public interface ExecutableElement extends Element, Parameterizable {
 
     /**
      * {@return the simple name of a constructor, method, or
-     * initializer}  For a constructor, the name {@code "<init>"} is
-     * returned, for a static initializer, the name {@code "<clinit>"}
-     * is returned, and for an anonymous class or instance
-     * initializer, an <a href=Name.html#empty_name>empty name</a> is
+     * initializer}  For a constructor, the name {@code "<init>"} or
+     * {@code "<vnew>"} is returned, for a static initializer, the
+     * name {@code "<clinit>"} is returned, and for an anonymous class
+     * or instance initializer, an <a href=Name.html#empty_name>empty name</a> is
      * returned.
      */
     @Override

src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java

@@ -615,7 +615,8 @@ private VarSymbol searchField(ClassSymbol tsym, Name fieldName, Set<ClassSymbol>
     }
 
     MethodSymbol findConstructor(ClassSymbol tsym, List<Type> paramTypes, boolean strict) {
-        for (Symbol sym : tsym.members().getSymbolsByName(names.init)) {
+        Name constructorName = tsym.isConcreteValueClass() ? names.vnew : names.init;
+        for (Symbol sym : tsym.members().getSymbolsByName(constructorName)) {
             if (sym.kind == MTH) {
                 if (hasParameterTypes((MethodSymbol) sym, paramTypes, strict)) {
                     return (MethodSymbol) sym;
@@ -635,7 +636,7 @@ private MethodSymbol searchMethod(ClassSymbol tsym, Name methodName,
         //### Note that this search is not necessarily what the compiler would do!
 
         // do not match constructors
-        if (methodName == names.init)
+        if (names.isInitOrVNew(methodName))
             return null;
 
         if (searched.contains(tsym))

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Printer.java

@@ -385,9 +385,7 @@ public String visitMethodSymbol(MethodSymbol s, Locale locale) {
         if (s.isStaticOrInstanceInit()) {
             return s.owner.name.toString();
         } else {
-            String ms = (s.name == s.name.table.names.init)
-                    ? s.owner.name.toString()
-                    : s.name.toString();
+            String ms = s.isInitOrVNew() ? s.owner.name.toString() : s.name.toString();
             if (s.type != null) {
                 if (s.type.hasTag(FORALL)) {
                     ms = "<" + visitTypes(s.type.getTypeArguments(), locale) + ">" + ms;

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java

@@ -357,7 +357,7 @@ public Type erasure(Types types) {
      */
     public Type externalType(Types types) {
         Type t = erasure(types);
-        if (name == name.table.names.init && owner.hasOuterInstance()) {
+        if (isInitOrVNew() && owner.hasOuterInstance()) {
             Type outerThisType = types.erasure(owner.type.getEnclosingType());
             return new MethodType(t.getParameterTypes().prepend(outerThisType),
                                   t.getReturnType(),
@@ -424,6 +424,10 @@ public boolean isValueClass() {
         return !isInterface() && (flags() & VALUE_CLASS) != 0;
     }
 
+    public boolean isConcreteValueClass() {
+        return isValueClass() && !isAbstract();
+    }
+
     public boolean isIdentityClass() {
         return !isInterface() && (flags() & IDENTITY_TYPE) != 0;
     }
@@ -483,7 +487,13 @@ public boolean isConstructor() {
     /** Is this symbol a value object factory?
      */
     public boolean isValueObjectFactory() {
-        return ((name == name.table.names.init && this.type.getReturnType().tsym == this.owner));
+        return name == name.table.names.vnew && this.type.getReturnType().tsym == this.owner;
+    }
+
+    /** Is this symbol a constructor or value factory?
+     */
+    public boolean isInitOrVNew() {
+        return name.table.names.isInitOrVNew(name);
     }
 
     public boolean isDynamic() {
@@ -1989,7 +1999,7 @@ public String toString() {
             if ((flags() & BLOCK) != 0) {
                 return owner.name.toString();
             } else {
-                String s = (name == name.table.names.init)
+                String s = isInitOrVNew()
                     ? owner.name.toString()
                     : name.toString();
                 if (type != null) {
@@ -2051,7 +2061,7 @@ public Symbol implementedIn(TypeSymbol c, Types types) {
          *  override the erasure of the other when seen from class `origin'?
          */
         public boolean binaryOverrides(Symbol _other, TypeSymbol origin, Types types) {
-            if (isConstructor() || _other.kind != MTH) return false;
+            if (isInitOrVNew() || _other.kind != MTH) return false;
 
             if (this == _other) return true;
             MethodSymbol other = (MethodSymbol)_other;
@@ -2120,7 +2130,7 @@ public boolean overrides(Symbol _other, TypeSymbol origin, Types types, boolean
          */
         public boolean overrides(Symbol _other, TypeSymbol origin, Types types, boolean checkResult,
                                             boolean requireConcreteIfInherited) {
-            if (isConstructor() || _other.kind != MTH) return false;
+            if (isInitOrVNew() || _other.kind != MTH) return false;
 
             if (this == _other) return true;
             MethodSymbol other = (MethodSymbol)_other;
@@ -2245,7 +2255,7 @@ public Symbol asMemberOf(Type site, Types types) {
 
         @DefinedBy(Api.LANGUAGE_MODEL)
         public ElementKind getKind() {
-            if (name == name.table.names.init)
+            if (isInitOrVNew())
                 return ElementKind.CONSTRUCTOR;
             else if (name == name.table.names.clinit)
                 return ElementKind.STATIC_INIT;
@@ -2418,7 +2428,7 @@ public int referenceKind() {
                         refSym.isStatic() ? ClassFile.REF_getStatic : ClassFile.REF_getField :
                         refSym.isStatic() ? ClassFile.REF_putStatic : ClassFile.REF_putField;
             } else {
-                if (refSym.isConstructor()) {
+                if (refSym.isInitOrVNew()) {
                     return ClassFile.REF_newInvokeSpecial;
                 } else {
                     if (refSym.isStatic()) {

src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java

@@ -214,7 +214,7 @@ private AnnotationType targetToAnnotationType(Attribute a, Symbol s) {
                 return AnnotationType.DECLARATION;
         } else if (e.value.name == names.METHOD) {
             if (s.kind == MTH &&
-                    !s.isConstructor())
+                    !s.isInitOrVNew())
                 return AnnotationType.DECLARATION;
         } else if (e.value.name == names.PARAMETER) {
             if (s.kind == VAR &&
@@ -240,9 +240,9 @@ private AnnotationType targetToAnnotationType(Attribute a, Symbol s) {
         } else if (e.value.name == names.TYPE_USE) {
             if (s.kind == TYP ||
                     s.kind == VAR ||
-                    (s.kind == MTH && !s.isConstructor() &&
+                    (s.kind == MTH && !s.isInitOrVNew() &&
                     !s.type.getReturnType().hasTag(TypeTag.VOID)) ||
-                    (s.kind == MTH && s.isConstructor()))
+                    (s.kind == MTH && s.isInitOrVNew()))
                 return AnnotationType.TYPE;
         } else if (e.value.name == names.TYPE_PARAMETER) {
             /* Irrelevant in this case */
@@ -1053,7 +1053,7 @@ private Attribute.TypeCompound toTypeCompound(Attribute.Compound a, TypeAnnotati
                     final int type_index = invocation.typeargs.indexOf(tree);
                     if (exsym == null) {
                         throw new AssertionError("could not determine symbol for {" + invocation + "}");
-                    } else if (exsym.isConstructor()) {
+                    } else if (exsym.isInitOrVNew()) {
                         return TypeAnnotationPosition
                             .constructorInvocationTypeArg(location.toList(),
                                                           currentLambda,
@@ -1156,7 +1156,7 @@ public void visitMethodDef(final JCMethodDecl tree) {
             }
             if (sigOnly) {
                 if (!tree.mods.annotations.isEmpty()) {
-                    if (tree.sym.isConstructor()) {
+                    if (tree.sym.isInitOrVNew()) {
                         final TypeAnnotationPosition pos =
                             TypeAnnotationPosition.methodReturn(tree.pos);
                         // Use null to mark that the annotations go