Revert "Wire up MyAssembyGen adn MyTypeGen -- breaks Framework"

This reverts commit 758ce2e.

We'll try conditionalizing FRAMEWORKs usage of AssemblyGen and TypeGen
using type aliases.

Author: dmiller

Clojure/Clojure/CljCompiler/Ast/IlGen.cs

@@ -25,16 +25,9 @@ namespace clojure.lang.CljCompiler.Ast
 {
     public class CljILGen : ILGen
     {
-        private readonly ILGenerator _ilGenerator;
-        public ILGenerator ILGenerator
-        {
-            get { return _ilGenerator; }
-        }
-
         public CljILGen(ILGenerator baseIlg)
             : base(baseIlg)
         {
-            _ilGenerator = baseIlg;
         }
 
         private static bool IsVolatile(FieldInfo fi)

Clojure/Clojure/CljCompiler/Ast/NewInstanceExpr.cs

@@ -12,7 +12,6 @@
 using Microsoft.Scripting.Generation;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
 
@@ -167,23 +166,14 @@ internal static ObjExpr Build(
 
             ret._methodMap = overrideables;
 
-#if NETFRAMEWORK
+  
             GenContext context = Compiler.IsCompiling
                 ? Compiler.CompilerContextVar.get() as GenContext
                 : (ret.IsDefType
                     ? GenContext.CreateWithExternalAssembly("deftype" + RT.nextID().ToString(), ".dll", true)
                     : (Compiler.CompilerContextVar.get() as GenContext
                         ??
                         Compiler.EvalContext));
-#else
-            GenContext context = Compiler.IsCompiling
-                ? Compiler.CompilerContextVar.get() as GenContext
-                : (ret.IsDefType
-                    ? GenContext.CreateWithInternalAssembly("deftype" + RT.nextID().ToString(), true)
-                    : (Compiler.CompilerContextVar.get() as GenContext
-                        ??
-                        Compiler.EvalContext));
-#endif
 
             GenContext genC = context.WithNewDynInitHelper(ret.InternalName + "__dynInitHelper_" + RT.nextID().ToString());
 
@@ -286,10 +276,6 @@ private static Type[] SeqToTypeArray(IPersistentVector interfaces)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Standard API")]
         Type CompileBaseClass(GenContext context, Type super, Type[] interfaces, Object frm)
         {
-
-            Console.WriteLine($"CompileBaseClass: super: {super.Name}, HasSecurity = {super.Attributes & TypeAttributes.HasSecurity}");
-            var customs = super.GetCustomAttributes().ToList();
-
             //TypeBuilder tb = context.ModuleBuilder.DefineType(Compiler.CompileStubPrefix + "." + InternalName + RT.nextID(), TypeAttributes.Public | TypeAttributes.Abstract, super, interfaces);
             TypeBuilder tb = context.ModuleBuilder.DefineType(Compiler.DeftypeBaseClassNamePrefix + "." + InternalName + RT.nextID(), TypeAttributes.Public | TypeAttributes.Abstract, super, interfaces);
 
@@ -450,7 +436,7 @@ private static bool ParametersMatch(MethodInfo m1, MethodInfo m2)
         //    return t.FullName.Replace(',', '/');
         //}
 
-#endregion
+        #endregion
 
         #region Method reflection
 

Clojure/Clojure/CljCompiler/Context/DynInitHelper.cs

@@ -37,9 +37,9 @@ class DynInitHelper
         #region Data
 
         int _id;
-        readonly MyAssemblyGen _assemblyGen;
+        readonly AssemblyGen _assemblyGen;
         TypeBuilder _typeBuilder;
-        MyTypeGen _typeGen;
+        TypeGen _typeGen;
 
         readonly string _typeName;
 
@@ -68,7 +68,7 @@ public SiteInfo(FieldBuilder fb, Type st, CallSiteBinder binder, Type delegateTy
 
         #region Ctors and factories
 
-        public DynInitHelper(MyAssemblyGen ag, string typeName)
+        public DynInitHelper(AssemblyGen ag, string typeName)
         {
             _assemblyGen = ag;
             _typeName = typeName;
@@ -116,13 +116,13 @@ private void MaybeInit()
             if (_typeBuilder == null)
             {
                 _typeBuilder = _assemblyGen.DefinePublicType(_typeName, typeof(object), true);
-                _typeGen = new MyTypeGen(_assemblyGen, _typeBuilder);
+                _typeGen = new TypeGen(_assemblyGen, _typeBuilder);
                 _siteInfos = new List<SiteInfo>();
             }
         }
 
 
-        private Expression RewriteCallSite(CallSite site, MyTypeGen tg, Type delegateType, out SiteInfo siteInfo)
+        private Expression RewriteCallSite(CallSite site, TypeGen tg, Type delegateType, out SiteInfo siteInfo)
         {
             if (!(site.Binder is IExpressionSerializable))
             {
@@ -163,7 +163,7 @@ private bool RewriteDelegate(Type delegateType, out Type newDelegateType)
             {
                 MethodInfo invoke = delegateType.GetMethod("Invoke");
 
-                newDelegateType = _typeGen.AssemblyGen.MakeDelegateType(
+                newDelegateType = /* _typeGen.AssemblyGen. */MakeDelegateType(
                     delegateType.Name,
                     invoke.GetParameters().Map(p => p.ParameterType),
                     invoke.ReturnType
@@ -215,45 +215,45 @@ private bool ShouldRewriteDelegate(Type delegateType)
             return false;
         }
 
-        //// From Microsoft.Scripting.Generation.AssemblyGen
-        //// Adapted to not being a method of AssemblyGen, which causes me to copy a WHOLE BUNCH of stuff.
-
-        //internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
-        //{
-        //    TypeBuilder builder = /* _assemblyGen. */DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
-        //    builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes);
-        //    builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
-        //    return builder.CreateType();
-        //}
-
-        //// From Microsoft.Scripting.Generation.AssemblyGen
-        ////private int _index;
-        //internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
-        //{
-        //    ContractUtils.RequiresNotNull(name, nameof(name));
-        //    ContractUtils.RequiresNotNull(parent, nameof(parent));
-
-        //    StringBuilder sb = new StringBuilder(name);
-        //    if (!preserveName)
-        //    {
-        //        int index = RT.nextID(); //Interlocked.Increment(ref _index);
-        //        sb.Append('$');
-        //        sb.Append(index);
-        //    }
-
-        //    // There is a bug in Reflection.Emit that leads to 
-        //    // Unhandled Exception: System.Runtime.InteropServices.COMException (0x80131130): Record not found on lookup.
-        //    // if there is any of the characters []*&+,\ in the type name and a method defined on the type is called.
-        //    sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_');
-
-        //    name = sb.ToString();
-        //    return /* _myModule */ _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
-        //}
-        //private const MethodAttributes CtorAttributes = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
-        //private const MethodImplAttributes ImplAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
-        //private const MethodAttributes InvokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
-        //private const TypeAttributes DelegateAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
-        //private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(nint) };
+        // From Microsoft.Scripting.Generation.AssemblyGen
+        // Adapted to not being a method of AssemblyGen, which causes me to copy a WHOLE BUNCH of stuff.
+
+        internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
+        {
+            TypeBuilder builder = /* _assemblyGen. */DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
+            builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes);
+            builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
+            return builder.CreateType();
+        }
+
+        // From Microsoft.Scripting.Generation.AssemblyGen
+        //private int _index;
+        internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
+        {
+            ContractUtils.RequiresNotNull(name, nameof(name));
+            ContractUtils.RequiresNotNull(parent, nameof(parent));
+
+            StringBuilder sb = new StringBuilder(name);
+            if (!preserveName)
+            {
+                int index = RT.nextID(); //Interlocked.Increment(ref _index);
+                sb.Append('$');
+                sb.Append(index);
+            }
+
+            // There is a bug in Reflection.Emit that leads to 
+            // Unhandled Exception: System.Runtime.InteropServices.COMException (0x80131130): Record not found on lookup.
+            // if there is any of the characters []*&+,\ in the type name and a method defined on the type is called.
+            sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_');
+
+            name = sb.ToString();
+            return /* _myModule */ _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
+        }
+        private const MethodAttributes CtorAttributes = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
+        private const MethodImplAttributes ImplAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
+        private const MethodAttributes InvokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
+        private const TypeAttributes DelegateAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
+        private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(nint) };
 
         #endregion
 

Clojure/Clojure/CljCompiler/Context/GenContext.cs

@@ -8,12 +8,10 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-using clojure.lang.CljCompiler.Ast;
 using clojure.lang.Runtime;
 using Microsoft.Scripting.Generation;
 using System;
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics.SymbolStore;
 using System.Linq.Expressions;
@@ -27,8 +25,8 @@ public sealed class GenContext
     {
         #region Data
 
-        readonly MyAssemblyGen _assyGen;
-        public MyAssemblyGen AssemblyGen
+        readonly AssemblyGen _assyGen;
+        public AssemblyGen AssemblyGen
         {
             get { return _assyGen; }
         }
@@ -75,16 +73,27 @@ public ISymbolDocumentWriter DocWriter
 
         #region C-tors & factory methods
 
-        private readonly static ConcurrentDictionary<Assembly, bool> _internalAssemblies = new ConcurrentDictionary<Assembly, bool>();
-        private static void AddInternalAssembly(Assembly a) => _internalAssemblies[a] = true;
-        public static bool IsInternalAssembly(Assembly a) => _internalAssemblies.ContainsKey(a);
+        private readonly static Dictionary<Assembly, bool> InternalAssemblies = new Dictionary<Assembly, bool>();
 
-        enum AssemblyType { Internal, External }
+        private static void AddInternalAssembly(Assembly a)
+        {
+            lock (((ICollection)InternalAssemblies).SyncRoot)
+            {
+                InternalAssemblies[a] = true;
+            }
+        }
 
+        public static bool IsInternalAssembly(Assembly a)
+        {
+            lock (((ICollection)InternalAssemblies).SyncRoot)
+            {
+                return InternalAssemblies.ContainsKey(a);
+            }
+        }
 
         public static GenContext CreateWithInternalAssembly(string assyName, bool createDynInitHelper)
         {
-            GenContext ctx = CreateGenContext(AssemblyType.Internal, assyName, assyName, ".dll", null, createDynInitHelper);
+            GenContext ctx = CreateGenContext(assyName, assyName, ".dll", null, createDynInitHelper);
             AddInternalAssembly(ctx.AssemblyBuilder);
             return ctx;
         }
@@ -99,15 +108,15 @@ public static GenContext CreateWithInternalAssembly(string assyName, bool create
         public static GenContext CreateWithExternalAssembly(string sourceName, string assyName, string extension, bool createDynInitHelper)
         {
             string path = Compiler.CompilePathVar.deref() as string;
-            return CreateGenContext(AssemblyType.External, sourceName, assyName, extension, path ?? System.IO.Directory.GetCurrentDirectory(), createDynInitHelper);
+            return CreateGenContext(sourceName, assyName, extension, path ?? System.IO.Directory.GetCurrentDirectory(), createDynInitHelper);
         }
 
         public static GenContext CreateWithExternalAssembly(string assyName, string extension, bool createDynInitHelper)
         {
             return CreateWithExternalAssembly(assyName, assyName, extension, createDynInitHelper);
         }
 
-        private static GenContext CreateGenContext(AssemblyType assemblyType, string sourceName, string assyName, string extension, string directory, bool createDynInitHelper)
+        private static GenContext CreateGenContext(string sourceName, string assyName, string extension, string directory, bool createDynInitHelper)
         {
             if (directory != null)
             {
@@ -116,10 +125,10 @@ private static GenContext CreateGenContext(AssemblyType assemblyType, string sou
             }
 
             AssemblyName aname = new AssemblyName(assyName);
-            return new GenContext(assemblyType, directory, aname, extension, createDynInitHelper, sourceName);
+            return new GenContext(directory, aname, extension, createDynInitHelper, sourceName);
         }
 
-        private GenContext(AssemblyType assemblyType, string directory, AssemblyName aname, string extension, bool createDynInitHelper, string sourceName)
+        private GenContext(string directory, AssemblyName aname, string extension, bool createDynInitHelper, string sourceName)
         {
             // TODO: Make this settable from a *debug* flag
 #if DEBUG
@@ -128,22 +137,7 @@ private GenContext(AssemblyType assemblyType, string directory, AssemblyName ana
             _isDebuggable = false;
 #endif
 
-#if NETFRAMEWORK || NET9_0_OR_GREATER
-            switch (assemblyType)
-            {
-                case AssemblyType.Internal:
-                    _assyGen = new MyAssemblyGen(aname, _isDebuggable);
-                    break;
-                case AssemblyType.External:
-                    _assyGen = new MyAssemblyGen(aname, directory, extension, _isDebuggable);
-                    break;
-                default:
-                    throw new InvalidOperationException("Unknown AssemblyType");
-            }
-#else
-            _assyGen = new MyAssemblyGen(aname, _isDebuggable);
-#endif
-
+            _assyGen = new AssemblyGen(aname, directory, extension, _isDebuggable);
             if (createDynInitHelper)
                 _dynInitHelper = new DynInitHelper(_assyGen, GenerateName());
 
@@ -156,9 +150,6 @@ private GenContext(AssemblyType assemblyType, string directory, AssemblyName ana
 #if NETFRAMEWORK
             if (_isDebuggable)
                 _docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid, ClojureContext.Default.VendorGuid, Guid.Empty);
-#elif NET9_0_OR_GREATER
-            if (_isDebuggable && assemblyType == AssemblyType.External)
-                _docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid); 
 #endif
         }
 
@@ -248,22 +239,22 @@ public Expression MaybeAddDebugInfo(Expression expr, IPersistentMap spanMap)
             return expr;
         }
 
-        public static void EmitDebugInfo(CljILGen ilg, IPersistentMap spanMap)
+        public static void EmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
         {
             if (Compiler.CompilerContextVar.deref() is GenContext context)
                 context.MaybeEmitDebugInfo(ilg, spanMap);
         }
 
-        public void MaybeEmitDebugInfo(CljILGen ilg, IPersistentMap spanMap)
+        public void MaybeEmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
         {
-#if NETFRAMEWORK || NET9_0_OR_GREATER
+#if NETFRAMEWORK
             if (_docWriter != null && spanMap != null)
             {
                 if (Compiler.GetLocations(spanMap, out int startLine, out int startCol, out int finishLine, out int finishCol))
                 {
                     try
                     {
-                        ilg.ILGenerator.MarkSequencePoint(_docWriter, startLine, startCol, finishLine, finishCol);
+                        ilg.MarkSequencePoint(_docWriter, startLine, startCol, finishLine, finishCol);
                     }
                     catch (NotSupportedException)
                     {

Clojure/Clojure/CljCompiler/GenInterface.cs

@@ -35,11 +35,8 @@ public static Type GenerateInterface(string iName, IPersistentMap attributes, Se
                 context = (GenContext)Compiler.CompilerContextVar.deref();
             }
             else
-#if NETFRAMEWORK
+                // TODO: In CLR4, should create a collectible type?
                 context = GenContext.CreateWithExternalAssembly(iName+"_"+RT.nextID(), ".dll", false);
-#else
-                context = GenContext.CreateWithInternalAssembly(iName + "_" + RT.nextID(), false);
-#endif
 
             for (ISeq s = RT.seq(extends); s != null; s = s.next())
             {

Clojure/Clojure/Lib/RT.cs

@@ -448,17 +448,7 @@ 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();
-                    Console.WriteLine("Clojure core loaded in " + _stopwatch.ElapsedMilliseconds + " milliseconds.");
                 }
                 finally
                 {