*** old/src/java.base/share/classes/java/lang/invoke/MethodHandle.java	Tue Sep  9 17:35:32 2014
--- new/src/java.base/share/classes/java/lang/invoke/MethodHandle.java	Tue Sep  9 17:35:32 2014

*** 862,875 ****
--- 862,884 ----
       *         <a href="MethodHandle.html#maxarity">too many parameters</a>
       * @throws WrongMethodTypeException if the implied {@code asType} call fails
       * @see #asCollector
       */
      public MethodHandle asSpreader(Class<?> arrayType, int arrayLength) {
!         MethodType postSpreadType = asSpreaderChecks(arrayType, arrayLength);
!         int spreadArgPos = type.parameterCount() - arrayLength;
!         int arity = type().parameterCount();
+         int spreadArgPos = arity - arrayLength;
+         if (USE_LAMBDA_FORM_EDITOR) {
+             MethodHandle afterSpread = this.asType(postSpreadType);
+             BoundMethodHandle mh = afterSpread.rebind();
+             LambdaForm lform = mh.editor().spreadArgumentsForm(1 + spreadArgPos, arrayType, arrayLength);
+             MethodType preSpreadType = postSpreadType.replaceParameterTypes(spreadArgPos, arity, arrayType);
+             return mh.copyWith(preSpreadType, lform);
+         } else {
              return MethodHandleImpl.makeSpreadArguments(this, arrayType, spreadArgPos, arrayLength);
          }
+     }
  
      /**
       * See if {@code asSpreader} can be validly called with the given arguments.
       * Return the type of the method handle call after spreading but before conversions.
       */

*** 984,1000 ****
--- 993,1021 ----
       * @see #asSpreader
       * @see #asVarargsCollector
       */
      public MethodHandle asCollector(Class<?> arrayType, int arrayLength) {
          asCollectorChecks(arrayType, arrayLength);
!         int collectArgPos = type().parameterCount() - 1;
+         if (USE_LAMBDA_FORM_EDITOR) {
+             BoundMethodHandle mh = rebind();
+             MethodType resultType = type().asCollectorType(arrayType, arrayLength);
+             MethodHandle newArray = MethodHandleImpl.varargsArray(arrayType, arrayLength);
+             LambdaForm lform = mh.editor().collectArgumentArrayForm(1 + collectArgPos, newArray);
+             if (lform != null) {
+                 return mh.copyWith(resultType, lform);
+             }
+             lform = mh.editor().collectArgumentsForm(1 + collectArgPos, newArray.type().basicType());
+             return mh.copyWithExtendL(resultType, lform, newArray);
+         } else {
              MethodHandle target = this;
              if (arrayType != type().parameterType(collectArgPos))
                  target = MethodHandleImpl.makePairwiseConvert(this, type().changeParameterType(collectArgPos, arrayType), true);
              MethodHandle collector = MethodHandleImpl.varargsArray(arrayType, arrayLength);
              return MethodHandles.collectArguments(target, collectArgPos, collector);
          }
+     }
  
      /**
       * See if {@code asCollector} can be validly called with the given arguments.
       * Return false if the last parameter is not an exact match to arrayType.
       */