Mercurial > hg > openjdk > lambda > jdk
changeset 10547:9732816c9d17
8024633: Lambda linkage performance - initialize generated class earlier
Reviewed-by: briangoetz, rfield
Contributed-by: sergey.kuksenko@oracle.com
author | briangoetz |
---|---|
date | Tue, 29 Oct 2013 12:45:18 -0400 |
parents | 82ee370c3d7e |
children | e93de88661ab |
files | src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java |
diffstat | 1 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Thu Oct 31 10:37:08 2013 -0400 +++ b/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Tue Oct 29 12:45:18 2013 -0400 @@ -197,22 +197,20 @@ new PrivilegedAction<Constructor[]>() { @Override public Constructor[] run() { - return innerClass.getDeclaredConstructors(); + Constructor<?>[] ctrs = innerClass.getDeclaredConstructors(); + if (ctrs.length == 1) { + // The lambda implementing inner class constructor is private, set + // it accessible (by us) before creating the constant sole instance + ctrs[0].setAccessible(true); + } + return ctrs; } - }); + }); if (ctrs.length != 1) { throw new LambdaConversionException("Expected one lambda constructor for " + innerClass.getCanonicalName() + ", got " + ctrs.length); } - // The lambda implementing inner class constructor is private, set - // it accessible (by us) before creating the constant sole instance - AccessController.doPrivileged(new PrivilegedAction<Void>() { - @Override - public Void run() { - ctrs[0].setAccessible(true); - return null; - } - }); + try { Object inst = ctrs[0].newInstance(); return new ConstantCallSite(MethodHandles.constant(samBase, inst)); @@ -222,6 +220,7 @@ } } else { try { + UNSAFE.ensureClassInitialized(innerClass); return new ConstantCallSite( MethodHandles.Lookup.IMPL_LOOKUP .findStatic(innerClass, NAME_FACTORY, invokedType));