archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Alejandro Murillo 2016-07-05 13:50:37 -07:00
commit 451f529750
466 changed files with 14230 additions and 14204 deletions
Download patch file Download diff file Expand all files Collapse all files

6
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
View file

@ -4307,7 +4307,7 @@ assertEquals("boojum", (String) catTrace.invokeExact("boo", "jum"));
assert Stream.of(fstep, fpred, ffini).flatMap(List::stream).map(MethodHandle::type).map(MethodType::parameterList).
allMatch(pl -> pl.equals(commonParameterSequence));
return MethodHandleImpl.makeLoop(loopReturnType, commonSuffix, commonPrefix, finit, fstep, fpred, ffini);
return MethodHandleImpl.makeLoop(loopReturnType, commonSuffix, finit, fstep, fpred, ffini);
}
private static List<MethodHandle> fillParameterTypes(List<MethodHandle> hs, final List<Class<?>> targetParams) {
@ -4814,10 +4814,8 @@ assertEquals("boojum", (String) catTrace.invokeExact("boo", "jum"));
// The cleanup parameter list (minus the leading Throwable and result parameters) must be a sublist of the
// target parameter list.
cleanup = dropArgumentsToMatch(cleanup, (rtype == void.class ? 1 : 2), targetParamTypes, 0);
MethodHandle aTarget = target.asSpreader(Object[].class, target.type().parameterCount());
MethodHandle aCleanup = cleanup.asSpreader(Object[].class, targetParamTypes.size());
return MethodHandleImpl.makeTryFinally(aTarget, aCleanup, rtype, targetParamTypes);
return MethodHandleImpl.makeTryFinally(target, cleanup, rtype, targetParamTypes);
}
/**