Make the direct link map persistent across compiles

Author: dmiller

Clojure/Clojure/CljCompiler/Ast/StaticInvokeExpr.cs

@@ -8,13 +8,8 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-/**
- *   Author: David Miller
- **/
-
 using clojure.lang.CljCompiler.Context;
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 
@@ -91,11 +86,10 @@ public static Expr Parse(Var v, ISeq args, object tag)
                 // We do not want to direct link to if we going into a non-PersistedAssemblyBuilder assembly --
                 //   this throws an exception when generating the method call IL in the StaticInvokeExpr.Emit
 
-                if ( Compiler.IsCompiling && 
-                     Compiler.DirectLinkingMapVar.deref() is  Dictionary<Var, Type> directLinkMap && 
+                if ( Compiler.IsCompiling &&
                      Compiler.CompilerContextVar.deref() is GenContext context &&
                      ! GenContext.IsInternalAssembly(context.AssemblyBuilder) &&
-                     directLinkMap.TryGetValue(v, out Type t))
+                     Compiler.TryGetDirectLink(v, out Type t))
                 {
                     if (t != null)
                         target = t;

Clojure/Clojure/CljCompiler/Compiler.cs

@@ -234,7 +234,6 @@ internal static int ColumnVarDeref()
 
         internal static readonly Var CompilerContextVar = Var.create(null).setDynamic();
         internal static readonly Var CompilerActiveVar = Var.create(false).setDynamic();
-        internal static readonly Var DirectLinkingMapVar = Var.create(null).setDynamic();
 
         public static Var CompilerOptionsVar;
 
@@ -516,9 +515,17 @@ static Compiler()
 
         #region Symbol/namespace resolving
 
-        // TODO: we have duplicate code below.
+        // Registry of Var -> Type
+        // Where the key is a Var that has been def'd to a Type that was generated by compilation.
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]
+        static Dictionary<Var, Type> _directLinkingMap = new Dictionary<Var, Type>();
+
+        public static void RegisterDirectLink(Var var, Type type) => _directLinkingMap[var] = type;
+        public static bool TryGetDirectLink(Var var, out Type t) => _directLinkingMap.TryGetValue(var, out t);
+
+// TODO: we have duplicate code below.
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]
         public static Symbol resolveSymbol(Symbol sym)
         {
             //already qualified or classname?
@@ -1739,8 +1746,7 @@ public static object Compile(GenContext context,TextReader rdr, string sourceDir
                 RT.WarnOnReflectionVar, RT.WarnOnReflectionVar.deref(),
                 RT.DataReadersVar, RT.DataReadersVar.deref(),
                 CompilerContextVar, context,
-                CompilerActiveVar, true,
-                DirectLinkingMapVar, new Dictionary<Var, Type>()
+                CompilerActiveVar, true
                 ));
 
             try
@@ -1828,7 +1834,7 @@ private static void Compile1(TypeBuilder tb, CljILGen ilg,  ObjExpr objx, object
 
                     if (expr is DefExpr dex && dex.Init is FnExpr fnx)
                     {
-                        ((Dictionary<Var, Type>)DirectLinkingMapVar.deref())[dex.Var] = fnx.CompiledType;
+                        RegisterDirectLink(dex.Var, fnx.CompiledType);                        
                     }
 
 #if NET9_0_OR_GREATER
@@ -1863,8 +1869,7 @@ private static void DoSeparateEval(ParserContext evPC, Object form)
                 //RT.WarnOnReflectionVar, RT.WarnOnReflectionVar.deref(),
                 //RT.DataReadersVar, RT.DataReadersVar.deref(),
                 CompilerContextVar, null,
-                CompilerActiveVar, false,
-                DirectLinkingMapVar, null       // we do not want to have the evaluated version try to direct link to functions in the compile assembly
+                CompilerActiveVar, false
                 ));
             try
             {

Clojure/Clojure/Lib/RT.cs

@@ -448,14 +448,6 @@ static RT()
 
                 try
                 {
-#if NETFRAMEWORK
-                    Console.WriteLine("Framework!");
-#elif NET9_0_OR_GREATER
-                    Console.WriteLine("Net 9! (or later)");
-#else
-                    Console.WriteLine("must be 6 or 8");
-#endif
-
                     RT.StartStopwatch();
                     load("clojure/core");
                     RT.StopStopwatch();