src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java

rev 9328 : 8027827: Improve performance of catchException combinator
8034120: MethodHandles.catchException doesn't handle VarargsCollector right
Reviewed-by: lagergren, psandoz, ?
rev 9329 : 8033666: Make sure @ForceInline is everywhere it needs to be in sun.misc and java.lang.invoke
Reviewed-by: ?

*** 46,64 ****
--- 46,66 ----
   * @author John Rose, JSR 292 EG
   */
  class InvokerBytecodeGenerator {
      /** Define class names for convenience. */
      private static final String MH      = "java/lang/invoke/MethodHandle";
+     private static final String MHI     = "java/lang/invoke/MethodHandleImpl";
      private static final String LF      = "java/lang/invoke/LambdaForm";
      private static final String LFN     = "java/lang/invoke/LambdaForm$Name";
      private static final String CLS     = "java/lang/Class";
      private static final String OBJ     = "java/lang/Object";
      private static final String OBJARY  = "[Ljava/lang/Object;";
  
      private static final String LF_SIG  = "L" + LF + ";";
      private static final String LFN_SIG = "L" + LFN + ";";
      private static final String LL_SIG  = "(L" + OBJ + ";)L" + OBJ + ";";
+     private static final String CLL_SIG = "(L" + CLS + ";L" + OBJ + ";)L" + OBJ + ";";
  
      /** Name of its super class*/
      private static final String superName = LF;
  
      /** Name of new class */
*** 431,441 ****
                  mv.visitTypeInsn(Opcodes.CHECKCAST, getInternalName(pclass));
              } else {
                  mv.visitLdcInsn(constantPlaceholder(pclass));
                  mv.visitTypeInsn(Opcodes.CHECKCAST, CLS);
                  mv.visitInsn(Opcodes.SWAP);
!                 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, CLS, "cast", LL_SIG, false);
                  if (pclass.isArray())
                      mv.visitTypeInsn(Opcodes.CHECKCAST, OBJARY);
              }
              return;
          case 'I':
--- 433,443 ----
                  mv.visitTypeInsn(Opcodes.CHECKCAST, getInternalName(pclass));
              } else {
                  mv.visitLdcInsn(constantPlaceholder(pclass));
                  mv.visitTypeInsn(Opcodes.CHECKCAST, CLS);
                  mv.visitInsn(Opcodes.SWAP);
!                 mv.visitMethodInsn(Opcodes.INVOKESTATIC, MHI, "castReference", CLL_SIG, false);
                  if (pclass.isArray())
                      mv.visitTypeInsn(Opcodes.CHECKCAST, OBJARY);
              }
              return;
          case 'I':