Make sure not to direct-link to persisted assembly hosted type from an non-persisted assembly. And get rid of a bunch of debug print statements

Author: dmiller

Clojure/Clojure/CljCompiler/Ast/StaticInvokeExpr.cs

@@ -12,6 +12,7 @@
  *   Author: David Miller
  **/
 
+using clojure.lang.CljCompiler.Context;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -85,8 +86,16 @@ public static Expr Parse(Var v, ISeq args, object tag)
             Type target = v.get().GetType();
 
             {
-                var directLinkMap = Compiler.DirectLinkingMapVar.deref() as Dictionary<Var, Type>;
-                if (directLinkMap != null && directLinkMap.TryGetValue(v, out Type t))
+                // DirectLinkingMap only contains Var -> Type mappings for Types that have been compiled.
+                // That is, types that are residing in a PersistedAssemblyBuilder.
+                // 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 && 
+                     Compiler.CompilerContextVar.deref() is GenContext context &&
+                     ! GenContext.IsInternalAssembly(context.AssemblyBuilder) &&
+                     directLinkMap.TryGetValue(v, out Type t))
                 {
                     if (t != null)
                         target = t;
@@ -183,11 +192,19 @@ public void EmitUnboxed(RHC rhc, ObjExpr objx, CljILGen ilg)
             else
                 MethodExpr.EmitTypedArgs(objx, ilg, _method.GetParameters(), _args);
 
-            Console.WriteLine($"{_method.DeclaringType.FullName} . {_method.Name}, {_method.ToString()}");
-            ilg.EmitCall(_method);
+
+            //ilg.EmitCall(_method);
+            if (_method.IsVirtual)
+            {
+                ilg.Emit(OpCodes.Callvirt, _method);
+            }
+            else
+            {
+                ilg.Emit(OpCodes.Call, _method);
+            }
         }
 
-        #endregion
+#endregion
 
         #region MaybePrimitiveExpr Members
 

Clojure/Clojure/CljCompiler/Compiler.cs

@@ -66,7 +66,6 @@ internal static void RegisterDuplicateType(Type type)
                 _compilerTypeMap[type.FullName] = type;
             else
                 _evalTypeMap[type.FullName] = type;
-            Console.WriteLine($"Register {type.FullName}, isCompilning = {Compiler.IsCompiling}");
         }
 
         internal static Type FindDuplicateType(string typename)
@@ -76,9 +75,6 @@ internal static Type FindDuplicateType(string typename)
 
             _evalTypeMap.TryGetValue(typename, out Type type);
 
-            if (Compiler.IsCompiling && type != null)
-                Console.WriteLine("Compiling, but found eval type!");
-
             return type;
         }
 
@@ -1814,12 +1810,6 @@ private static void Compile1(TypeBuilder tb, CljILGen ilg,  ObjExpr objx, object
 
             try
             {
-                {
-                    var item = RT.first(form);
-                    if (item is Symbol s && s.Name.Equals("definline"))
-                        Console.WriteLine("definline!");
-                }
-
                 form = Macroexpand(form);
                 if (form is ISeq && Util.Equals(RT.first(form), DoSym))
                 {

Clojure/Clojure/CljCompiler/Context/GenContext.cs

@@ -160,7 +160,6 @@ private GenContext(AssemblyType assemblyType, string directory, AssemblyName ana
         {
             // TODO: Make this settable from a *debug* flag
 
-            Console.WriteLine($"Creating GenContext for {aname.Name}, {sourceName}");
 #if DEBUG
             _isDebuggable = true;
 #else

Clojure/Clojure/CljCompiler/GenInterface.cs

@@ -22,7 +22,6 @@ public static class GenInterface
 
         public static Type GenerateInterface(string iName, IPersistentMap attributes, Seqable extends, ISeq methods)
         {
-            Console.WriteLine($"Generating inteface {iName}, isCompiling = {Compiler.IsCompiling}");
             iName = iName.Replace('-', '_');
 
             GenContext context;