Skip to content

Commit 758ce2e

Browse files
dmillerdmiller
committed
Wire up MyAssembyGen adn MyTypeGen -- breaks Framework
1 parent b196f72 commit 758ce2e

6 files changed

Lines changed: 118 additions & 75 deletions

File tree

‎Clojure/Clojure/CljCompiler/Ast/IlGen.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,16 @@ namespace clojure.lang.CljCompiler.Ast
2525
{
2626
public class CljILGen : ILGen
2727
{
28+
private readonly ILGenerator _ilGenerator;
29+
public ILGenerator ILGenerator
30+
{
31+
get { return _ilGenerator; }
32+
}
33+
2834
public CljILGen(ILGenerator baseIlg)
2935
: base(baseIlg)
3036
{
37+
_ilGenerator = baseIlg;
3138
}
3239

3340
private static bool IsVolatile(FieldInfo fi)

‎Clojure/Clojure/CljCompiler/Ast/NewInstanceExpr.cs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.Scripting.Generation;
1313
using System;
1414
using System.Collections.Generic;
15+
using System.Linq;
1516
using System.Reflection;
1617
using System.Reflection.Emit;
1718

@@ -166,14 +167,23 @@ internal static ObjExpr Build(
166167

167168
ret._methodMap = overrideables;
168169

169-
170+
#if NETFRAMEWORK
170171
GenContext context = Compiler.IsCompiling
171172
? Compiler.CompilerContextVar.get() as GenContext
172173
: (ret.IsDefType
173174
? GenContext.CreateWithExternalAssembly("deftype" + RT.nextID().ToString(), ".dll", true)
174175
: (Compiler.CompilerContextVar.get() as GenContext
175176
??
176177
Compiler.EvalContext));
178+
#else
179+
GenContext context = Compiler.IsCompiling
180+
? Compiler.CompilerContextVar.get() as GenContext
181+
: (ret.IsDefType
182+
? GenContext.CreateWithInternalAssembly("deftype" + RT.nextID().ToString(), true)
183+
: (Compiler.CompilerContextVar.get() as GenContext
184+
??
185+
Compiler.EvalContext));
186+
#endif
177187

178188
GenContext genC = context.WithNewDynInitHelper(ret.InternalName + "__dynInitHelper_" + RT.nextID().ToString());
179189

@@ -276,6 +286,10 @@ private static Type[] SeqToTypeArray(IPersistentVector interfaces)
276286
[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Standard API")]
277287
Type CompileBaseClass(GenContext context, Type super, Type[] interfaces, Object frm)
278288
{
289+
290+
Console.WriteLine($"CompileBaseClass: super: {super.Name}, HasSecurity = {super.Attributes & TypeAttributes.HasSecurity}");
291+
var customs = super.GetCustomAttributes().ToList();
292+
279293
//TypeBuilder tb = context.ModuleBuilder.DefineType(Compiler.CompileStubPrefix + "." + InternalName + RT.nextID(), TypeAttributes.Public | TypeAttributes.Abstract, super, interfaces);
280294
TypeBuilder tb = context.ModuleBuilder.DefineType(Compiler.DeftypeBaseClassNamePrefix + "." + InternalName + RT.nextID(), TypeAttributes.Public | TypeAttributes.Abstract, super, interfaces);
281295

@@ -436,7 +450,7 @@ private static bool ParametersMatch(MethodInfo m1, MethodInfo m2)
436450
// return t.FullName.Replace(',', '/');
437451
//}
438452

439-
#endregion
453+
#endregion
440454

441455
#region Method reflection
442456

‎Clojure/Clojure/CljCompiler/Context/DynInitHelper.cs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ class DynInitHelper
3737
#region Data
3838

3939
int _id;
40-
readonly AssemblyGen _assemblyGen;
40+
readonly MyAssemblyGen _assemblyGen;
4141
TypeBuilder _typeBuilder;
42-
TypeGen _typeGen;
42+
MyTypeGen _typeGen;
4343

4444
readonly string _typeName;
4545

@@ -68,7 +68,7 @@ public SiteInfo(FieldBuilder fb, Type st, CallSiteBinder binder, Type delegateTy
6868

6969
#region Ctors and factories
7070

71-
public DynInitHelper(AssemblyGen ag, string typeName)
71+
public DynInitHelper(MyAssemblyGen ag, string typeName)
7272
{
7373
_assemblyGen = ag;
7474
_typeName = typeName;
@@ -116,13 +116,13 @@ private void MaybeInit()
116116
if (_typeBuilder == null)
117117
{
118118
_typeBuilder = _assemblyGen.DefinePublicType(_typeName, typeof(object), true);
119-
_typeGen = new TypeGen(_assemblyGen, _typeBuilder);
119+
_typeGen = new MyTypeGen(_assemblyGen, _typeBuilder);
120120
_siteInfos = new List<SiteInfo>();
121121
}
122122
}
123123

124124

125-
private Expression RewriteCallSite(CallSite site, TypeGen tg, Type delegateType, out SiteInfo siteInfo)
125+
private Expression RewriteCallSite(CallSite site, MyTypeGen tg, Type delegateType, out SiteInfo siteInfo)
126126
{
127127
if (!(site.Binder is IExpressionSerializable))
128128
{
@@ -163,7 +163,7 @@ private bool RewriteDelegate(Type delegateType, out Type newDelegateType)
163163
{
164164
MethodInfo invoke = delegateType.GetMethod("Invoke");
165165

166-
newDelegateType = /* _typeGen.AssemblyGen. */MakeDelegateType(
166+
newDelegateType = _typeGen.AssemblyGen.MakeDelegateType(
167167
delegateType.Name,
168168
invoke.GetParameters().Map(p => p.ParameterType),
169169
invoke.ReturnType
@@ -215,45 +215,45 @@ private bool ShouldRewriteDelegate(Type delegateType)
215215
return false;
216216
}
217217

218-
// From Microsoft.Scripting.Generation.AssemblyGen
219-
// Adapted to not being a method of AssemblyGen, which causes me to copy a WHOLE BUNCH of stuff.
220-
221-
internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
222-
{
223-
TypeBuilder builder = /* _assemblyGen. */DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
224-
builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes);
225-
builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
226-
return builder.CreateType();
227-
}
228-
229-
// From Microsoft.Scripting.Generation.AssemblyGen
230-
//private int _index;
231-
internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
232-
{
233-
ContractUtils.RequiresNotNull(name, nameof(name));
234-
ContractUtils.RequiresNotNull(parent, nameof(parent));
235-
236-
StringBuilder sb = new StringBuilder(name);
237-
if (!preserveName)
238-
{
239-
int index = RT.nextID(); //Interlocked.Increment(ref _index);
240-
sb.Append('$');
241-
sb.Append(index);
242-
}
243-
244-
// There is a bug in Reflection.Emit that leads to
245-
// Unhandled Exception: System.Runtime.InteropServices.COMException (0x80131130): Record not found on lookup.
246-
// if there is any of the characters []*&+,\ in the type name and a method defined on the type is called.
247-
sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_');
248-
249-
name = sb.ToString();
250-
return /* _myModule */ _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
251-
}
252-
private const MethodAttributes CtorAttributes = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
253-
private const MethodImplAttributes ImplAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
254-
private const MethodAttributes InvokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
255-
private const TypeAttributes DelegateAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
256-
private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(nint) };
218+
//// From Microsoft.Scripting.Generation.AssemblyGen
219+
//// Adapted to not being a method of AssemblyGen, which causes me to copy a WHOLE BUNCH of stuff.
220+
221+
//internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
222+
//{
223+
// TypeBuilder builder = /* _assemblyGen. */DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
224+
// builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes);
225+
// builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
226+
// return builder.CreateType();
227+
//}
228+
229+
//// From Microsoft.Scripting.Generation.AssemblyGen
230+
////private int _index;
231+
//internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
232+
//{
233+
// ContractUtils.RequiresNotNull(name, nameof(name));
234+
// ContractUtils.RequiresNotNull(parent, nameof(parent));
235+
236+
// StringBuilder sb = new StringBuilder(name);
237+
// if (!preserveName)
238+
// {
239+
// int index = RT.nextID(); //Interlocked.Increment(ref _index);
240+
// sb.Append('$');
241+
// sb.Append(index);
242+
// }
243+
244+
// // There is a bug in Reflection.Emit that leads to
245+
// // Unhandled Exception: System.Runtime.InteropServices.COMException (0x80131130): Record not found on lookup.
246+
// // if there is any of the characters []*&+,\ in the type name and a method defined on the type is called.
247+
// sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_');
248+
249+
// name = sb.ToString();
250+
// return /* _myModule */ _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
251+
//}
252+
//private const MethodAttributes CtorAttributes = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
253+
//private const MethodImplAttributes ImplAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
254+
//private const MethodAttributes InvokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
255+
//private const TypeAttributes DelegateAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
256+
//private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(nint) };
257257

258258
#endregion
259259

‎Clojure/Clojure/CljCompiler/Context/GenContext.cs‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
* You must not remove this notice, or any other, from this software.
99
**/
1010

11+
using clojure.lang.CljCompiler.Ast;
1112
using clojure.lang.Runtime;
1213
using Microsoft.Scripting.Generation;
1314
using System;
1415
using System.Collections;
16+
using System.Collections.Concurrent;
1517
using System.Collections.Generic;
1618
using System.Diagnostics.SymbolStore;
1719
using System.Linq.Expressions;
@@ -25,8 +27,8 @@ public sealed class GenContext
2527
{
2628
#region Data
2729

28-
readonly AssemblyGen _assyGen;
29-
public AssemblyGen AssemblyGen
30+
readonly MyAssemblyGen _assyGen;
31+
public MyAssemblyGen AssemblyGen
3032
{
3133
get { return _assyGen; }
3234
}
@@ -73,27 +75,16 @@ public ISymbolDocumentWriter DocWriter
7375

7476
#region C-tors & factory methods
7577

76-
private readonly static Dictionary<Assembly, bool> InternalAssemblies = new Dictionary<Assembly, bool>();
78+
private readonly static ConcurrentDictionary<Assembly, bool> _internalAssemblies = new ConcurrentDictionary<Assembly, bool>();
79+
private static void AddInternalAssembly(Assembly a) => _internalAssemblies[a] = true;
80+
public static bool IsInternalAssembly(Assembly a) => _internalAssemblies.ContainsKey(a);
7781

78-
private static void AddInternalAssembly(Assembly a)
79-
{
80-
lock (((ICollection)InternalAssemblies).SyncRoot)
81-
{
82-
InternalAssemblies[a] = true;
83-
}
84-
}
82+
enum AssemblyType { Internal, External }
8583

86-
public static bool IsInternalAssembly(Assembly a)
87-
{
88-
lock (((ICollection)InternalAssemblies).SyncRoot)
89-
{
90-
return InternalAssemblies.ContainsKey(a);
91-
}
92-
}
9384

9485
public static GenContext CreateWithInternalAssembly(string assyName, bool createDynInitHelper)
9586
{
96-
GenContext ctx = CreateGenContext(assyName, assyName, ".dll", null, createDynInitHelper);
87+
GenContext ctx = CreateGenContext(AssemblyType.Internal, assyName, assyName, ".dll", null, createDynInitHelper);
9788
AddInternalAssembly(ctx.AssemblyBuilder);
9889
return ctx;
9990
}
@@ -108,15 +99,15 @@ public static GenContext CreateWithInternalAssembly(string assyName, bool create
10899
public static GenContext CreateWithExternalAssembly(string sourceName, string assyName, string extension, bool createDynInitHelper)
109100
{
110101
string path = Compiler.CompilePathVar.deref() as string;
111-
return CreateGenContext(sourceName, assyName, extension, path ?? System.IO.Directory.GetCurrentDirectory(), createDynInitHelper);
102+
return CreateGenContext(AssemblyType.External, sourceName, assyName, extension, path ?? System.IO.Directory.GetCurrentDirectory(), createDynInitHelper);
112103
}
113104

114105
public static GenContext CreateWithExternalAssembly(string assyName, string extension, bool createDynInitHelper)
115106
{
116107
return CreateWithExternalAssembly(assyName, assyName, extension, createDynInitHelper);
117108
}
118109

119-
private static GenContext CreateGenContext(string sourceName, string assyName, string extension, string directory, bool createDynInitHelper)
110+
private static GenContext CreateGenContext(AssemblyType assemblyType, string sourceName, string assyName, string extension, string directory, bool createDynInitHelper)
120111
{
121112
if (directory != null)
122113
{
@@ -125,10 +116,10 @@ private static GenContext CreateGenContext(string sourceName, string assyName, s
125116
}
126117

127118
AssemblyName aname = new AssemblyName(assyName);
128-
return new GenContext(directory, aname, extension, createDynInitHelper, sourceName);
119+
return new GenContext(assemblyType, directory, aname, extension, createDynInitHelper, sourceName);
129120
}
130121

131-
private GenContext(string directory, AssemblyName aname, string extension, bool createDynInitHelper, string sourceName)
122+
private GenContext(AssemblyType assemblyType, string directory, AssemblyName aname, string extension, bool createDynInitHelper, string sourceName)
132123
{
133124
// TODO: Make this settable from a *debug* flag
134125
#if DEBUG
@@ -137,7 +128,22 @@ private GenContext(string directory, AssemblyName aname, string extension, bool
137128
_isDebuggable = false;
138129
#endif
139130

140-
_assyGen = new AssemblyGen(aname, directory, extension, _isDebuggable);
131+
#if NETFRAMEWORK || NET9_0_OR_GREATER
132+
switch (assemblyType)
133+
{
134+
case AssemblyType.Internal:
135+
_assyGen = new MyAssemblyGen(aname, _isDebuggable);
136+
break;
137+
case AssemblyType.External:
138+
_assyGen = new MyAssemblyGen(aname, directory, extension, _isDebuggable);
139+
break;
140+
default:
141+
throw new InvalidOperationException("Unknown AssemblyType");
142+
}
143+
#else
144+
_assyGen = new MyAssemblyGen(aname, _isDebuggable);
145+
#endif
146+
141147
if (createDynInitHelper)
142148
_dynInitHelper = new DynInitHelper(_assyGen, GenerateName());
143149

@@ -150,6 +156,9 @@ private GenContext(string directory, AssemblyName aname, string extension, bool
150156
#if NETFRAMEWORK
151157
if (_isDebuggable)
152158
_docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid, ClojureContext.Default.VendorGuid, Guid.Empty);
159+
#elif NET9_0_OR_GREATER
160+
if (_isDebuggable && assemblyType == AssemblyType.External)
161+
_docWriter = ModuleBuilder.DefineDocument(sourceName, ClojureContext.Default.LanguageGuid);
153162
#endif
154163
}
155164

@@ -239,22 +248,22 @@ public Expression MaybeAddDebugInfo(Expression expr, IPersistentMap spanMap)
239248
return expr;
240249
}
241250

242-
public static void EmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
251+
public static void EmitDebugInfo(CljILGen ilg, IPersistentMap spanMap)
243252
{
244253
if (Compiler.CompilerContextVar.deref() is GenContext context)
245254
context.MaybeEmitDebugInfo(ilg, spanMap);
246255
}
247256

248-
public void MaybeEmitDebugInfo(ILGen ilg, IPersistentMap spanMap)
257+
public void MaybeEmitDebugInfo(CljILGen ilg, IPersistentMap spanMap)
249258
{
250-
#if NETFRAMEWORK
259+
#if NETFRAMEWORK || NET9_0_OR_GREATER
251260
if (_docWriter != null && spanMap != null)
252261
{
253262
if (Compiler.GetLocations(spanMap, out int startLine, out int startCol, out int finishLine, out int finishCol))
254263
{
255264
try
256265
{
257-
ilg.MarkSequencePoint(_docWriter, startLine, startCol, finishLine, finishCol);
266+
ilg.ILGenerator.MarkSequencePoint(_docWriter, startLine, startCol, finishLine, finishCol);
258267
}
259268
catch (NotSupportedException)
260269
{

‎Clojure/Clojure/CljCompiler/GenInterface.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@ public static Type GenerateInterface(string iName, IPersistentMap attributes, Se
3535
context = (GenContext)Compiler.CompilerContextVar.deref();
3636
}
3737
else
38-
// TODO: In CLR4, should create a collectible type?
38+
#if NETFRAMEWORK
3939
context = GenContext.CreateWithExternalAssembly(iName+"_"+RT.nextID(), ".dll", false);
40+
#else
41+
context = GenContext.CreateWithInternalAssembly(iName + "_" + RT.nextID(), false);
42+
#endif
4043

4144
for (ISeq s = RT.seq(extends); s != null; s = s.next())
4245
{

‎Clojure/Clojure/Lib/RT.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,17 @@ static RT()
448448

449449
try
450450
{
451+
#if NETFRAMEWORK
452+
Console.WriteLine("Framework!");
453+
#elif NET9_0_OR_GREATER
454+
Console.WriteLine("Net 9! (or later)");
455+
#else
456+
Console.WriteLine("must be 6 or 8");
457+
#endif
458+
RT.StartStopwatch();
451459
load("clojure/core");
460+
RT.StopStopwatch();
461+
Console.WriteLine("Clojure core loaded in " + _stopwatch.ElapsedMilliseconds + " milliseconds.");
452462
}
453463
finally
454464
{

0 commit comments

Comments
 (0)