Spring/spring-loaded
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP on Java8. Looking at lambda reloading first (required invokedynamic handling)

Browse Source
This commit is contained in:
Andy Clement
2014-02-13 10:39:32 -08:00
parent 8dff505b88
commit 9774e2a0d4
64 changed files with 745 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
springloaded/src/main/java/org/springsource/loaded/Utils.java
View File

@@ -1369,7 +1369,7 @@ public class Utils implements Opcodes, Constants {
return access;
}
public static int promoteDefaultOrProtectedToPublic(int access, boolean isEnum) {
public static int promoteDefaultOrProtectedToPublic(int access, boolean isEnum, String name) {
if ((access & Constants.ACC_PUBLIC_PRIVATE_PROTECTED) == 0) {
// is default
return (access | Modifier.PUBLIC);
@@ -1382,6 +1382,10 @@ public class Utils implements Opcodes, Constants {
// was private, need to 'publicize' it
return access - Constants.ACC_PRIVATE + Constants.ACC_PUBLIC;
}
if ((access&Constants.ACC_PRIVATE_STATIC_SYNTHETIC)==ACC_PRIVATE_STATIC_SYNTHETIC && name.startsWith("lambda")) {
// Special case for lambda, may need to generalize for general invokedynamic support
return access - Constants.ACC_PRIVATE + Constants.ACC_PUBLIC;
}
return access;
}
@@ -1733,7 +1737,11 @@ public class Utils implements Opcodes, Constants {
// TODO [performance] speed up by throwing exception from first visit method? (but this isn't used in the mainline really)
// TODO or just write a quicker bytecode parser that just looks at the interfaces then returns
private static class InterfaceCollectingClassVisitor implements ClassVisitor {
private static class InterfaceCollectingClassVisitor extends ClassVisitor {
public InterfaceCollectingClassVisitor() {
super(ASM5);
}
public String[] interfaces;