diff options
Diffstat (limited to 'src/core/lombok')
| -rw-r--r-- | src/core/lombok/bytecode/ClassFileMetaData.java | 7 | ||||
| -rw-r--r-- | src/core/lombok/core/TypeResolver.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/core/lombok/bytecode/ClassFileMetaData.java b/src/core/lombok/bytecode/ClassFileMetaData.java index 826eed83..0510292d 100644 --- a/src/core/lombok/bytecode/ClassFileMetaData.java +++ b/src/core/lombok/bytecode/ClassFileMetaData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2018 The Project Lombok Authors. + * Copyright (C) 2010-2019 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -43,6 +43,7 @@ public class ClassFileMetaData { // New in java7: support for methodhandles and invokedynamic private static final byte METHOD_HANDLE = 15; private static final byte METHOD_TYPE = 16; + private static final byte DYNAMIC = 17; private static final byte INVOKE_DYNAMIC = 18; // New in java9: support for modules private static final byte MODULE = 19; @@ -96,6 +97,7 @@ public class ClassFileMetaData { case INTERFACE_METHOD: case NAME_TYPE: case INVOKE_DYNAMIC: + case DYNAMIC: position += 4; break; case LONG: @@ -388,6 +390,9 @@ public class ClassFileMetaData { case METHOD_TYPE: result.append("MethodType..."); break; + case DYNAMIC: + result.append("Dynamic..."); + break; case INVOKE_DYNAMIC: result.append("InvokeDynamic..."); break; diff --git a/src/core/lombok/core/TypeResolver.java b/src/core/lombok/core/TypeResolver.java index 3e126123..2c36d1fc 100644 --- a/src/core/lombok/core/TypeResolver.java +++ b/src/core/lombok/core/TypeResolver.java @@ -48,7 +48,7 @@ public class TypeResolver { public String typeRefToFullyQualifiedName(LombokNode<?, ?, ?> context, TypeLibrary library, String typeRef) { // When asking if 'Foo' could possibly be referring to 'bar.Baz', the answer is obviously no. List<String> qualifieds = library.toQualifieds(typeRef); - if (qualifieds.isEmpty()) return null; + if (qualifieds == null || qualifieds.isEmpty()) return null; // When asking if 'lombok.Getter' could possibly be referring to 'lombok.Getter', the answer is obviously yes. if (qualifieds.contains(typeRef)) return LombokInternalAliasing.processAliases(typeRef); |