Merge pull request #2741 from usethesource/fix/no-cache-during-loading

do not cache global functions during initialization anymore

Author: jurgenvinju

src/org/rascalmpl/interpreter/env/ModuleEnvironment.java

@@ -583,22 +583,29 @@ public void getAllFunctions(String name, List<AbstractFunction> collection) {
 		collection.addAll(lookupCachedFunctions(name));
 	}
 
+	private List<AbstractFunction> lookupFunctionsNoCache(String name) {
+		var result = new ArrayList<AbstractFunction>();
+		super.getAllFunctions(name, result);
+			
+		for (ModuleEnvironment mod : importedModulesResolved)  {	
+			if (mod != null) {
+				mod.getLocalPublicFunctions(name, result);
+			}
+		}
+		return result;
+	}
+
 	private List<AbstractFunction> lookupCachedFunctions(String name) {
 		if (cachedPublicFunctions == null) {
 			cachedPublicFunctions = io.usethesource.capsule.Map.Transient.of();
 		}
-		return cachedPublicFunctions.computeIfAbsent(name, n -> {
-			var result = new ArrayList<AbstractFunction>();
-			super.getAllFunctions(n, result);
-			
-			for (ModuleEnvironment mod : importedModulesResolved) {
-				
-				if (mod != null) {
-					mod.getLocalPublicFunctions(n, result);
-				}
-			}
-			return result;
-		});
+
+		if (!initialized) {
+			return lookupFunctionsNoCache(name);
+		}
+		else {
+			return cachedPublicFunctions.computeIfAbsent(name, this::lookupFunctionsNoCache);
+		}
 	}
 
 	@Override

src/org/rascalmpl/library/lang/rascal/tests/basic/FunctionCachesAndGlobals.rsc

@@ -4,6 +4,6 @@ default int f(int _) = 42;
 int x = f(0);
 int f(0) = 0;
 
-test bool globalInitLast() = x == 0;
 
-// test bool noCacheDuringInit() = f(0) == 0;
+test bool noCacheDuringInit() = f(0) == 0;
+test bool globalInitLast() = x == 0;