[fixes #1554] javac9 now caches type lookups based on ‘position’ which is slapped together by a tuple based on the position (as gleaned from the JCTree object) and the source file (as gleaned from.. Log. *facepalm*). We didn’t update log when resolving for i.e. ‘val’, so the caches get all jumbled up. Fixed by setting the Log’s ‘useSource’ method.

1 files changed, 10 insertions, 3 deletions

diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java
index 79c7cad2..26ba86c0 100644
--- a/src/core/lombok/javac/JavacResolution.java
+++ b/src/core/lombok/javac/JavacResolution.java
@@ -31,6 +31,7 @@ import java.util.ArrayDeque;
 import java.util.Map;
 
 import javax.lang.model.type.TypeKind;
+import javax.tools.JavaFileObject;
 
 import lombok.Lombok;
 import lombok.core.debug.AssertionLogger;
@@ -59,6 +60,7 @@ import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.ListBuffer;
+import com.sun.tools.javac.util.Log;
 
 public class JavacResolution {
 	private final Attr attr;
@@ -142,9 +144,14 @@ public class JavacResolution {
 			
 			TreeMirrorMaker mirrorMaker = new TreeMirrorMaker(node.getTreeMaker(), node.getContext());
 			JCTree copy = mirrorMaker.copy(finder.copyAt());
-			
-			memberEnterAndAttribute(copy, finder.get(), node.getContext());
-			return mirrorMaker.getOriginalToCopyMap();
+			Log log = Log.instance(node.getContext());
+			JavaFileObject oldFileObject = log.useSource(((JCCompilationUnit) node.top().get()).getSourceFile());
+			try {
+				memberEnterAndAttribute(copy, finder.get(), node.getContext());
+				return mirrorMaker.getOriginalToCopyMap();
+			} finally {
+				log.useSource(oldFileObject);
+			}
 		} finally {
 			messageSuppressor.enableLoggers();
 		}