Avoid using cached bindings when the module isn't loaded from cache (#…

…8669)
enso-org · Jan 5, 2024 · 8396bfa · 8396bfa
1 parent 41fe87f
commit 8396bfa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/Compiler.scala
@@ -259,9 +259,12 @@ class Compiler(
     )
 
     val requiredModules = modules.flatMap { module =>
-      val importedModules = runImportsAndExportsResolution(module, generateCode)
       val isLoadedFromSource =
         (m: Module) => !context.wasLoadedFromCache(m) && !context.isSynthetic(m)
+      val importedModules = runImportsAndExportsResolution(
+        module,
+        generateCode && context.wasLoadedFromCache(module)
+      )
       if (
         shouldCompileDependencies &&
         context.wasLoadedFromCache(module) &&

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/caches/Cache.java b/engine/runtime/src/main/java/org/enso/interpreter/caches/Cache.java
@@ -218,6 +218,9 @@ public final Optional<T> load(EnsoContext context) {
                   }
 
                   logger.log(logLevel, "Unable to load a cache [" + logName + "]");
+                } catch (IOException e) {
+                  logger.log(
+                      Level.FINE, "Unable to load a cache [" + logName + "]: " + e.getMessage(), e);
                 } catch (Exception e) {
                   logger.log(
                       Level.WARNING,