From 9be8cd4afdc2f12e6b6b26776f3ea6ccf79621c1 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 28 Nov 2017 23:43:19 +0100 Subject: bugfix for delomboking source that does not compile; it should just emit compiler errors, not stack traces. --- src/core/lombok/javac/JavacResolution.java | 1 + src/utils/lombok/javac/JavacTreeMaker.java | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java index 67dbaac6..0b6e1341 100644 --- a/src/core/lombok/javac/JavacResolution.java +++ b/src/core/lombok/javac/JavacResolution.java @@ -261,6 +261,7 @@ public class JavacResolution { } public static Type ifTypeIsIterableToComponent(Type type, JavacAST ast) { + if (type == null) return null; Types types = Types.instance(ast.getContext()); Symtab syms = Symtab.instance(ast.getContext()); Type boundType = ReflectiveAccess.Types_upperBound(types, type); diff --git a/src/utils/lombok/javac/JavacTreeMaker.java b/src/utils/lombok/javac/JavacTreeMaker.java index 12baf5af..5f4fb09c 100644 --- a/src/utils/lombok/javac/JavacTreeMaker.java +++ b/src/utils/lombok/javac/JavacTreeMaker.java @@ -226,6 +226,7 @@ public class JavacTreeMaker { } public static TypeTag typeTag(Type t) { + if (t == null) return Javac.CTC_VOID; try { return new TypeTag(getFieldCached(FIELD_CACHE, t, "tag")); } catch (NoSuchFieldException e) { -- cgit