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

rev 10271 : 8037209: Improvements and cleanups to bytecode assembly for lambda forms
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
rev 10274 : 8050052: Small cleanups in java.lang.invoke code
Reviewed-by: ?

*** 43,64 ****
  
      static final boolean DEBUG_METHOD_HANDLE_NAMES;
      static final boolean DUMP_CLASS_FILES;
      static final boolean TRACE_INTERPRETER;
      static final boolean TRACE_METHOD_LINKAGE;
!     static final Integer COMPILE_THRESHOLD;
      static final int PROFILE_LEVEL;
  
      static {
          final Object[] values = { false, false, false, false, null, null };
          AccessController.doPrivileged(new PrivilegedAction<Void>() {
                  public Void run() {
                      values[0] = Boolean.getBoolean("java.lang.invoke.MethodHandle.DEBUG_NAMES");
                      values[1] = Boolean.getBoolean("java.lang.invoke.MethodHandle.DUMP_CLASS_FILES");
                      values[2] = Boolean.getBoolean("java.lang.invoke.MethodHandle.TRACE_INTERPRETER");
                      values[3] = Boolean.getBoolean("java.lang.invoke.MethodHandle.TRACE_METHOD_LINKAGE");
!                     values[4] = Integer.getInteger("java.lang.invoke.MethodHandle.COMPILE_THRESHOLD");
                      values[5] = Integer.getInteger("java.lang.invoke.MethodHandle.PROFILE_LEVEL", 0);
                      return null;
                  }
              });
          DEBUG_METHOD_HANDLE_NAMES = (Boolean) values[0];
--- 43,64 ----
  
      static final boolean DEBUG_METHOD_HANDLE_NAMES;
      static final boolean DUMP_CLASS_FILES;
      static final boolean TRACE_INTERPRETER;
      static final boolean TRACE_METHOD_LINKAGE;
!     static final int COMPILE_THRESHOLD;
      static final int PROFILE_LEVEL;
  
      static {
          final Object[] values = { false, false, false, false, null, null };
          AccessController.doPrivileged(new PrivilegedAction<Void>() {
                  public Void run() {
                      values[0] = Boolean.getBoolean("java.lang.invoke.MethodHandle.DEBUG_NAMES");
                      values[1] = Boolean.getBoolean("java.lang.invoke.MethodHandle.DUMP_CLASS_FILES");
                      values[2] = Boolean.getBoolean("java.lang.invoke.MethodHandle.TRACE_INTERPRETER");
                      values[3] = Boolean.getBoolean("java.lang.invoke.MethodHandle.TRACE_METHOD_LINKAGE");
!                     values[4] = Integer.getInteger("java.lang.invoke.MethodHandle.COMPILE_THRESHOLD", 30);
                      values[5] = Integer.getInteger("java.lang.invoke.MethodHandle.PROFILE_LEVEL", 0);
                      return null;
                  }
              });
          DEBUG_METHOD_HANDLE_NAMES = (Boolean) values[0];
*** 129,139 ****
--- 129,142 ----
          return new IllegalArgumentException(message(message, obj));
      }
      /*non-public*/ static RuntimeException newIllegalArgumentException(String message, Object obj, Object obj2) {
          return new IllegalArgumentException(message(message, obj, obj2));
      }
+     /** Propagate unchecked exceptions and errors, but wrap anything checked and throw that instead. */
      /*non-public*/ static Error uncaughtException(Throwable ex) {
+         if (ex instanceof Error)  throw (Error) ex;
+         if (ex instanceof RuntimeException)  throw (RuntimeException) ex;
          throw newInternalError("uncaught exception", ex);
      }
      static Error NYI() {
          throw new AssertionError("NYI");
      }