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

rev 9490 : 8037210: Get rid of char-based descriptions 'J' of basic types
Reviewed-by: ?
Contributed-by: john.r.rose@oracle.com
rev 9491 : 8037209: Improvements and cleanups to bytecode assembly for lambda forms
Reviewed-by: ?
Contributed-by: john.r.rose@oracle.com

*** 397,407 ****
      static int signatureArity(String sig) {
          assert(isValidSignature(sig));
          return sig.indexOf('_');
      }
      static byte signatureReturn(String sig) {
!         return basicType(sig.charAt(signatureArity(sig)+1));
      }
      static boolean isValidSignature(String sig) {
          int arity = sig.indexOf('_');
          if (arity < 0)  return false;  // must be of the form *_*
          int siglen = sig.length();
--- 397,407 ----
      static int signatureArity(String sig) {
          assert(isValidSignature(sig));
          return sig.indexOf('_');
      }
      static byte signatureReturn(String sig) {
!         return basicType(sig.charAt(signatureArity(sig) + 1));
      }
      static boolean isValidSignature(String sig) {
          int arity = sig.indexOf('_');
          if (arity < 0)  return false;  // must be of the form *_*
          int siglen = sig.length();
*** 515,525 ****
              if (TRACE_INTERPRETER)
                  traceInterpreter("compileToBytecode", this);
              isCompiled = true;
              return vmentry;
          } catch (Error | Exception ex) {
!             throw newInternalError("compileToBytecode", ex);
          }
      }
  
      private static final ConcurrentHashMap<String,LambdaForm> PREPARED_FORMS;
      static {
--- 515,525 ----
              if (TRACE_INTERPRETER)
                  traceInterpreter("compileToBytecode", this);
              isCompiled = true;
              return vmentry;
          } catch (Error | Exception ex) {
!             throw newInternalError("compileToBytecode: " + this, ex);
          }
      }
  
      private static final ConcurrentHashMap<String,LambdaForm> PREPARED_FORMS;
      static {