jdk-sandbox: comparison jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java

equal deleted inserted replaced

-:d247e52b5262
+:5f40f1d88890
 /**
 * Return the {@link SpeciesData} instance representing this BMH species. All subclasses must provide a
 * static field containing this value, and they must accordingly implement this method.
 */
-protected abstract SpeciesData speciesData();
+/*non-public*/ abstract SpeciesData speciesData();
 @Override
 final Object internalProperties() {
 return "/BMH="+internalValues();
 }
 boundValues[i] = arg(i);
 }
 return Arrays.asList(boundValues);
 }
-public final Object arg(int i) {
+/*non-public*/ final Object arg(int i) {
 try {
 switch (speciesData().fieldType(i)) {
 case 'L': return argL(i);
 case 'I': return argI(i);
 case 'F': return argF(i);
 } catch (Throwable ex) {
 throw newInternalError(ex);
 }
 throw new InternalError("unexpected type: " + speciesData().types+"."+i);
 }
-public final Object argL(int i) throws Throwable { return          speciesData().getters[i].invokeBasic(this); }
+/*non-public*/ final Object argL(int i) throws Throwable { return          speciesData().getters[i].invokeBasic(this); }
-public final int    argI(int i) throws Throwable { return (int)    speciesData().getters[i].invokeBasic(this); }
+/*non-public*/ final int    argI(int i) throws Throwable { return (int)    speciesData().getters[i].invokeBasic(this); }
-public final float  argF(int i) throws Throwable { return (float)  speciesData().getters[i].invokeBasic(this); }
+/*non-public*/ final float  argF(int i) throws Throwable { return (float)  speciesData().getters[i].invokeBasic(this); }
-public final double argD(int i) throws Throwable { return (double) speciesData().getters[i].invokeBasic(this); }
+/*non-public*/ final double argD(int i) throws Throwable { return (double) speciesData().getters[i].invokeBasic(this); }
-public final long   argJ(int i) throws Throwable { return (long)   speciesData().getters[i].invokeBasic(this); }
+/*non-public*/ final long   argJ(int i) throws Throwable { return (long)   speciesData().getters[i].invokeBasic(this); }
 //
 // cloning API
 //
-public abstract BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable;
+/*non-public*/ abstract BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable;
-public abstract BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable;
+/*non-public*/ abstract BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable;
-public abstract BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int    narg) throws Throwable;
+/*non-public*/ abstract BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int    narg) throws Throwable;
-public abstract BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long   narg) throws Throwable;
+/*non-public*/ abstract BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long   narg) throws Throwable;
-public abstract BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float  narg) throws Throwable;
+/*non-public*/ abstract BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float  narg) throws Throwable;
-public abstract BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable;
+/*non-public*/ abstract BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable;
 // The following is a grossly irregular hack:
 @Override MethodHandle reinvokerTarget() {
 try {
 return (MethodHandle) argL(0);
 //
 private  // make it private to force users to access the enclosing class first
 static final class Species_L extends BoundMethodHandle {
 final Object argL0;
-public Species_L(MethodType mt, LambdaForm lf, Object argL0) {
+/*non-public*/ Species_L(MethodType mt, LambdaForm lf, Object argL0) {
 super(mt, lf);
 this.argL0 = argL0;
 }
 // The following is a grossly irregular hack:
 @Override MethodHandle reinvokerTarget() { return (MethodHandle) argL0; }
 @Override
-public SpeciesData speciesData() {
+/*non-public*/ SpeciesData speciesData() {
 return SPECIES_DATA;
 }
-public static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("L", Species_L.class);
+/*non-public*/ static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("L", Species_L.class);
 @Override
-public final BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable {
+/*non-public*/ final BoundMethodHandle clone(MethodType mt, LambdaForm lf) throws Throwable {
 return new Species_L(mt, lf, argL0);
 }
 @Override
-public final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable {
+/*non-public*/ final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) throws Throwable {
 return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_L).constructor[0].invokeBasic(mt, lf, argL0, narg);
 }
 @Override
-public final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) throws Throwable {
+/*non-public*/ final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) throws Throwable {
 return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_I).constructor[0].invokeBasic(mt, lf, argL0, narg);
 }
 @Override
-public final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) throws Throwable {
+/*non-public*/ final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) throws Throwable {
 return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_J).constructor[0].invokeBasic(mt, lf, argL0, narg);
 }
 @Override
-public final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) throws Throwable {
+/*non-public*/ final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) throws Throwable {
 return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_F).constructor[0].invokeBasic(mt, lf, argL0, narg);
 }
 @Override
-public final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable {
+/*non-public*/ final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) throws Throwable {
 return (BoundMethodHandle) SPECIES_DATA.extendWithIndex(INDEX_D).constructor[0].invokeBasic(mt, lf, argL0, narg);
 }
 }
 /*
 // Therefore, we need a non-final link in the chain.  Use array elements.
 final MethodHandle[]                     constructor;
 final MethodHandle[]                     getters;
 final SpeciesData[]                      extensions;
-public int fieldCount() {
+/*non-public*/ int fieldCount() {
 return types.length();
 }
-public char fieldType(int i) {
+/*non-public*/ char fieldType(int i) {
 return types.charAt(i);
 }
 public String toString() {
 return "SpeciesData["+(isPlaceholder() ? "<placeholder>" : clazz.getSimpleName())+":"+types+"]";
 * class BoundMethodHandle { ... private static
 * final class Species_LLI extends BoundMethodHandle {
 *     final Object argL0;
 *     final Object argL1;
 *     final int argI2;
-*     public Species_LLI(MethodType mt, LambdaForm lf, Object argL0, Object argL1, int argI2) {
+*     Species_LLI(MethodType mt, LambdaForm lf, Object argL0, Object argL1, int argI2) {
 *         super(mt, lf);
 *         this.argL0 = argL0;
 *         this.argL1 = argL1;
 *         this.argI2 = argI2;
 *     }
-*     public final SpeciesData speciesData() { return SPECIES_DATA; }
+*     final SpeciesData speciesData() { return SPECIES_DATA; }
-*     public static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("LLI", Species_LLI.class);
+*     static final SpeciesData SPECIES_DATA = SpeciesData.getForClass("LLI", Species_LLI.class);
-*     public final BoundMethodHandle clone(MethodType mt, LambdaForm lf) {
+*     final BoundMethodHandle clone(MethodType mt, LambdaForm lf) {
 *         return SPECIES_DATA.constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2);
 *     }
-*     public final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) {
+*     final BoundMethodHandle cloneExtendL(MethodType mt, LambdaForm lf, Object narg) {
 *         return SPECIES_DATA.extendWithIndex(INDEX_L).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
 *     }
-*     public final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) {
+*     final BoundMethodHandle cloneExtendI(MethodType mt, LambdaForm lf, int narg) {
 *         return SPECIES_DATA.extendWithIndex(INDEX_I).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
 *     }
-*     public final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) {
+*     final BoundMethodHandle cloneExtendJ(MethodType mt, LambdaForm lf, long narg) {
 *         return SPECIES_DATA.extendWithIndex(INDEX_J).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
 *     }
-*     public final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) {
+*     final BoundMethodHandle cloneExtendF(MethodType mt, LambdaForm lf, float narg) {
 *         return SPECIES_DATA.extendWithIndex(INDEX_F).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
 *     }
-*     public final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) {
+*     final BoundMethodHandle cloneExtendD(MethodType mt, LambdaForm lf, double narg) {
 *         return SPECIES_DATA.extendWithIndex(INDEX_D).constructor[0].invokeBasic(mt, lf, argL0, argL1, argI2, narg);
 *     }
 * }
 * </pre>
 *
 static Class<? extends BoundMethodHandle> generateConcreteBMHClass(String types) {
 final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES);
 final String className  = SPECIES_PREFIX_PATH + types;
 final String sourceFile = SPECIES_PREFIX_NAME + types;
-cw.visit(V1_6, ACC_PUBLIC + ACC_FINAL + ACC_SUPER, className, null, BMH, null);
+final int NOT_ACC_PUBLIC = 0;  // not ACC_PUBLIC
+cw.visit(V1_6, NOT_ACC_PUBLIC + ACC_FINAL + ACC_SUPER, className, null, BMH, null);
 cw.visitSource(sourceFile, null);
 // emit static types and SPECIES_DATA fields
-cw.visitField(ACC_PUBLIC + ACC_STATIC, "SPECIES_DATA", SPECIES_DATA_SIG, null, null).visitEnd();
+cw.visitField(NOT_ACC_PUBLIC + ACC_STATIC, "SPECIES_DATA", SPECIES_DATA_SIG, null, null).visitEnd();
 // emit bound argument fields
 for (int i = 0; i < types.length(); ++i) {
 final char t = types.charAt(i);
 final String fieldName = makeFieldName(types, i);
 }
 MethodVisitor mv;
 // emit constructor
-mv = cw.visitMethod(ACC_PUBLIC, "<init>", makeSignature(types, true), null, null);
+mv = cw.visitMethod(NOT_ACC_PUBLIC, "<init>", makeSignature(types, true), null, null);
 mv.visitCode();
 mv.visitVarInsn(ALOAD, 0);
 mv.visitVarInsn(ALOAD, 1);
 mv.visitVarInsn(ALOAD, 2);
 mv.visitInsn(RETURN);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
 // emit implementation of reinvokerTarget()
-mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "reinvokerTarget", "()" + MH_SIG, null, null);
+mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "reinvokerTarget", "()" + MH_SIG, null, null);
 mv.visitCode();
 mv.visitVarInsn(ALOAD, 0);
 mv.visitFieldInsn(GETFIELD, className, "argL0", JLO_SIG);
 mv.visitTypeInsn(CHECKCAST, MH);
 mv.visitInsn(ARETURN);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
 // emit implementation of speciesData()
-mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "speciesData", MYSPECIES_DATA_SIG, null, null);
+mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "speciesData", MYSPECIES_DATA_SIG, null, null);
 mv.visitCode();
 mv.visitFieldInsn(GETSTATIC, className, "SPECIES_DATA", SPECIES_DATA_SIG);
 mv.visitInsn(ARETURN);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
 // emit clone()
-mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "clone", makeSignature("", false), null, E_THROWABLE);
+mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "clone", makeSignature("", false), null, E_THROWABLE);
 mv.visitCode();
 // return speciesData().constructor[0].invokeBasic(mt, lf, argL0, ...)
 // obtain constructor
 mv.visitVarInsn(ALOAD, 0);
 mv.visitFieldInsn(GETSTATIC, className, "SPECIES_DATA", SPECIES_DATA_SIG);
 mv.visitEnd();
 // for each type, emit cloneExtendT()
 for (Class<?> c : TYPES) {
 char t = Wrapper.basicTypeChar(c);
-mv = cw.visitMethod(ACC_PUBLIC + ACC_FINAL, "cloneExtend" + t, makeSignature(String.valueOf(t), false), null, E_THROWABLE);
+mv = cw.visitMethod(NOT_ACC_PUBLIC + ACC_FINAL, "cloneExtend" + t, makeSignature(String.valueOf(t), false), null, E_THROWABLE);
 mv.visitCode();
 // return SPECIES_DATA.extendWithIndex(extensionIndex(t)).constructor[0].invokeBasic(mt, lf, argL0, ..., narg)
 // obtain constructor
 mv.visitFieldInsn(GETSTATIC, className, "SPECIES_DATA", SPECIES_DATA_SIG);
 int iconstInsn = ICONST_0 + extensionIndex(t);
 mv.visitMaxs(0, 0);
 mv.visitEnd();
 }
 // emit class initializer
-mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "<clinit>", VOID_SIG, null, null);
+mv = cw.visitMethod(NOT_ACC_PUBLIC | ACC_STATIC, "<clinit>", VOID_SIG, null, null);
 mv.visitCode();
 mv.visitLdcInsn(types);
 mv.visitLdcInsn(Type.getObjectType(className));
 mv.visitMethodInsn(INVOKESTATIC, SPECIES_DATA, "getForClass", BMHSPECIES_DATA_GFC_SIG, false);
 mv.visitFieldInsn(PUTSTATIC, className, "SPECIES_DATA", SPECIES_DATA_SIG);

changeset 23918	5f40f1d88890
parent 23038	bb8b3b23af3a
child 24572	5c9e5961d21c