src/java.base/share/classes/java/util/concurrent/CompletableFuture.java

8197531: Miscellaneous changes imported from jsr166 CVS 2018-04
Reviewed-by: martin, psandoz

*** 2881,2891 ****
              MethodHandles.Lookup l = MethodHandles.lookup();
              RESULT = l.findVarHandle(CompletableFuture.class, "result", Object.class);
              STACK = l.findVarHandle(CompletableFuture.class, "stack", Completion.class);
              NEXT = l.findVarHandle(Completion.class, "next", Completion.class);
          } catch (ReflectiveOperationException e) {
!             throw new Error(e);
          }
  
          // Reduce the risk of rare disastrous classloading in first call to
          // LockSupport.park: https://bugs.openjdk.java.net/browse/JDK-8074773
          Class<?> ensureLoaded = LockSupport.class;
--- 2881,2891 ----
              MethodHandles.Lookup l = MethodHandles.lookup();
              RESULT = l.findVarHandle(CompletableFuture.class, "result", Object.class);
              STACK = l.findVarHandle(CompletableFuture.class, "stack", Completion.class);
              NEXT = l.findVarHandle(Completion.class, "next", Completion.class);
          } catch (ReflectiveOperationException e) {
!             throw new ExceptionInInitializerError(e);
          }
  
          // Reduce the risk of rare disastrous classloading in first call to
          // LockSupport.park: https://bugs.openjdk.java.net/browse/JDK-8074773
          Class<?> ensureLoaded = LockSupport.class;