Fix null libraries not entered into map

hpi-swa · Feb 5, 2024 · 51ff062 · 51ff062
1 parent 4169948
commit 51ff062
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...wa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/ffi/PrimExternalCallNode.java b/...wa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/plugins/ffi/PrimExternalCallNode.java
@@ -46,6 +46,10 @@ public PrimExternalCallNode(final Object moduleLibrary, final InteropLibrary mod
     public static PrimExternalCallNode load(final String moduleName, final String functionName, final int numReceiverAndArguments) {
         final SqueakImageContext context = SqueakImageContext.getSlow();
         final Object moduleLibrary = loadedLibraries.computeIfAbsent(moduleName, (String s) -> {
+            if (loadedLibraries.containsKey(moduleName)) {
+                // if moduleName was associated with null
+                return null;
+            }
             final Object library;
             try {
                 library = NFIUtils.loadLibrary(context, moduleName, "{ setInterpreter(POINTER):SINT64; }");
@@ -71,6 +75,8 @@ public static PrimExternalCallNode load(final String moduleName, final String fu
             }
             return library;
         });
+        // computeIfAbsent would not put null value
+        loadedLibraries.putIfAbsent(moduleName, moduleLibrary);
         if (moduleLibrary == null) {
             // module not found
             return null;