Cache frozen call targets in multicontext mode

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

@@ -650,9 +650,11 @@ public static PythonModule importFrozenModuleObject(Node inliningTarget, PConstr
     }
 
     private static RootCallTarget createCallTarget(PythonContext context, FrozenInfo info) {
-        String name = PythonLanguage.FROZEN_FILENAME_PREFIX + info.name + PythonLanguage.FROZEN_FILENAME_SUFFIX;
-        Source source = Source.newBuilder("python", "", name).content(Source.CONTENT_NONE).build();
-        return context.getLanguage().callTargetFromBytecode(context, source, info.code);
+        return (RootCallTarget) context.getLanguage().cacheCode(new PythonLanguage.CodeCacheKey(info.origName, System.identityHashCode(info.code)), () -> {
+            String name = PythonLanguage.FROZEN_FILENAME_PREFIX + info.name + PythonLanguage.FROZEN_FILENAME_SUFFIX;
+            Source source = Source.newBuilder("python", "", name).content(Source.CONTENT_NONE).build();
+            return PythonLanguage.callTargetFromBytecode(context, source, info.code);
+        });
     }
 
     /*

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java

@@ -120,11 +120,11 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
+import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.ExecutionContext.BoundaryCallContext;
 import com.oracle.graal.python.runtime.IndirectCallData.BoundaryCallData;
 import com.oracle.graal.python.runtime.IndirectCallData.InteropCallData;
-import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.object.PFactory;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -261,7 +261,10 @@ static Object doit(VirtualFrame frame, Object file,
         }
     }
 
-    // cache_key is a GraalPy-specific keyword
+    /*
+     * cache_key is a GraalPy-specific keyword used in the code cache in multi-context mode,
+     * together with the filename from the unmarshalled code
+     */
     @Builtin(name = "loads", minNumOfPositionalArgs = 1, numOfPositionalOnlyArgs = 1, parameterNames = {"bytes"}, keywordOnlyNames = {"cache_key"})
     @ArgumentClinic(name = "bytes", conversion = ClinicConversion.ReadableBuffer)
     @ArgumentClinic(name = "cache_key", conversion = ClinicConversion.Long, defaultValue = "0")