Skip to content

Commit e4c67ac

Browse files
dmillerdmiller
committed
WIP: Work on defrecord. Still lots of debugging prints embedded
1 parent 4066dec commit e4c67ac

File tree

8 files changed

+144
-21
lines changed

8 files changed

+144
-21
lines changed

‎Clojure/Clojure/CljCompiler/Ast/HostExpr.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,14 @@ public static Type MaybeType(object form, bool stringOk)
316316
{
317317
object o = Compiler.CurrentNamespace.GetMapping(sym);
318318
if (o is Type type1)
319+
{
319320
t = type1;
321+
322+
var tName = type1.FullName;
323+
var compiledType = Compiler.FindDuplicateCompiledType(tName);
324+
if (compiledType is not null && Compiler.IsCompiling)
325+
t = compiledType;
326+
}
320327
else if (Compiler.LocalEnvVar.deref() != null && ((IPersistentMap)Compiler.LocalEnvVar.deref()).containsKey(form)) // JVM casts to java.util.Map
321328
return null;
322329
else

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@ public CljILGen(ILGenerator baseIlg)
3535

3636
private static bool IsVolatile(FieldInfo fi)
3737
{
38-
// Cannot work with signatures on uncreated types
38+
// Cannot work with signatures on uncreated types or from PersistedAssemblyBuilders
3939
{
4040
Type t = fi.DeclaringType;
4141
TypeBuilder tb = t as TypeBuilder;
4242
if (tb != null && !tb.IsCreated())
4343
return false;
44+
#if NET9_0_OR_GREATER
45+
if (tb != null && tb.Assembly is PersistedAssemblyBuilder)
46+
return false;
47+
#endif
4448
}
4549

4650
if (RT.IsRunningOnMono)

‎Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,15 @@ private void EmitComplexCall(ObjExpr objx, CljILGen ilg)
250250
typeof(System.Runtime.CompilerServices.CallSite)
251251
};
252252
callsiteParamTypes.AddRange(paramTypes);
253-
Type dynType = Microsoft.Scripting.Generation.Snippets.Shared.DefineDelegate("__interop__", returnType, callsiteParamTypes.ToArray());
253+
254+
// PLAN9: Seeing if replacing this helps.
255+
//Type dynType = Microsoft.Scripting.Generation.Snippets.Shared.DefineDelegate("__interop__", returnType, callsiteParamTypes.ToArray());
256+
GenContext context = Compiler.CompilerContextVar.deref() as GenContext;
257+
DynInitHelper dih = context?.DynInitHelper;
258+
if (dih is null)
259+
throw new InvalidOperationException("Don't know how to handle callsite in this case");
260+
Type dynType = dih.MakeDelegateType("__interop__", callsiteParamTypes.ToArray(), returnType);
261+
254262
DynamicExpression dyn = Expression.MakeDynamic(dynType, binder, paramExprs);
255263
EmitDynamicCallPreamble(dyn, _spanMap, "__interop_" + _methodName + RT.nextID(), returnType, paramExprs, paramTypes.ToArray(), ilg, out LambdaExpression lambda, out Type delType, out MethodBuilder mbLambda);
256264

@@ -323,14 +331,19 @@ static public void EmitDynamicCallPreamble(DynamicExpression dyn, IPersistentMap
323331
call = GenContext.AddDebugInfo(call, spanMap);
324332

325333

326-
delType = Microsoft.Scripting.Generation.Snippets.Shared.DefineDelegate("__interop__", returnType, paramTypes);
327-
lambda = Expression.Lambda(delType, call, paramExprs);
334+
// PLAN9 : seeing if we can replace this
335+
// delType = Microsoft.Scripting.Generation.Snippets.Shared.DefineDelegate("__interop__", returnType, paramTypes);
336+
delType = context.DynInitHelper.MakeDelegateType("__interop__", paramTypes, returnType);
337+
338+
lambda = null;
328339
mbLambda = null;
329340

330341
if (context == null)
331342
{
332343
// light compile
333344

345+
lambda = Expression.Lambda(delType, call, paramExprs);
346+
334347
Delegate d = lambda.Compile();
335348
int key = RT.nextID();
336349
CacheDelegate(key, d);

‎Clojure/Clojure/CljCompiler/Ast/NewExpr.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ private ConstructorInfo ComputeCtor()
8888
RT.errPrintWriter().Flush();
8989
}
9090

91+
#if NET9_0_OR_GREATER
92+
if (_type != null && Compiler.IsCompiling && _type.Assembly.IsDynamic && _type.Assembly is not PersistedAssemblyBuilder)
93+
Console.WriteLine($"Compiling, found constructor for dynamic, non-persisted type: {_type}");
94+
#endif
95+
9196
return ctor;
9297
}
9398

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ Type CompileBaseClass(GenContext context, Type super, Type[] interfaces, Object
303303
BaseClassAltCtorNoHash = GetConstructorWithArgCount(t, CtorTypes().Length - 2);
304304
}
305305

306+
Compiler.RegisterDuplicateType(t);
306307
return t;
307308
}
308309

‎Clojure/Clojure/CljCompiler/Compiler.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ internal static Type FindDuplicateType(string typename)
7474
{ return compiledType; }
7575

7676
_evalTypeMap.TryGetValue(typename, out Type type);
77+
78+
if (Compiler.IsCompiling && type != null)
79+
Console.WriteLine("Compiling, but found eval type!");
80+
7781
return type;
7882
}
7983

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

Lines changed: 104 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
using System.Reflection;
2828
using System.Reflection.Emit;
2929
using System.Runtime.CompilerServices;
30+
using System.Runtime.InteropServices;
3031
using System.Text;
32+
using System.Threading;
33+
using System.Xml.Serialization;
34+
3135

3236
#if NETFRAMEWORK
3337
using AssemblyGenT = Microsoft.Scripting.Generation.AssemblyGen;
@@ -223,19 +227,58 @@ private bool ShouldRewriteDelegate(Type delegateType)
223227
return false;
224228
}
225229

226-
// From Microsoft.Scripting.Generation.AssemblyGen
227-
// Adapted to not being a method of AssemblyGen, which causes me to copy a WHOLE BUNCH of stuff.
230+
// // From Microsoft.Scripting.Generation.AssemblyGen
231+
// // Adapted to not being a method of AssemblyGen, which causes me to copy a WHOLE BUNCH of stuff.
232+
233+
// internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
234+
// {
235+
// TypeBuilder builder = /* _assemblyGen. */DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
236+
//#if NET9_0_OR_GREATER
237+
// // cannot call SetImplementationFlags on a PersistedAssemblyBuilder
238+
// builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature);
239+
// builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters);
240+
//#else
241+
// builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes);
242+
// builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
243+
//#endif
244+
// return builder.CreateType();
245+
// }
246+
247+
//// From Microsoft.Scripting.Generation.AssemblyGen
248+
////private int _index;
249+
//internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
250+
//{
251+
// ContractUtils.RequiresNotNull(name, nameof(name));
252+
// ContractUtils.RequiresNotNull(parent, nameof(parent));
253+
254+
// StringBuilder sb = new StringBuilder(name);
255+
// if (!preserveName)
256+
// {
257+
// int index = RT.nextID(); //Interlocked.Increment(ref _index);
258+
// sb.Append('$');
259+
// sb.Append(index);
260+
// }
261+
262+
// // There is a bug in Reflection.Emit that leads to
263+
// // Unhandled Exception: System.Runtime.InteropServices.COMException (0x80131130): Record not found on lookup.
264+
// // if there is any of the characters []*&+,\ in the type name and a method defined on the type is called.
265+
// sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_');
266+
267+
// name = sb.ToString();
268+
// return /* _myModule */ _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
269+
//}
270+
//private const MethodAttributes CtorAttributes = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
271+
//private const MethodImplAttributes ImplAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
272+
//private const MethodAttributes InvokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
273+
//private const TypeAttributes DelegateAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
274+
//private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(nint) };
275+
276+
// I had been using code (shown above) take from Microsoft.Scripting.Generation.AssemblyGen.
277+
// Elsewhere (MethodExpr) I had been using similar code from Microsoft.Scripting.Generation.Snippets.
278+
// I need to modify the Snippets code to work with PersistedAssemblyBuilder. (There is a call to add MethodImplAttributes to the emthod metadata that fails.)
279+
280+
// The two code bases are almost identical. THe code below combines them as appropriate and conditionalizes for PersistentAssemblyBuilder.
228281

229-
internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
230-
{
231-
TypeBuilder builder = /* _assemblyGen. */DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
232-
builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes);
233-
builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes);
234-
return builder.CreateType();
235-
}
236-
237-
// From Microsoft.Scripting.Generation.AssemblyGen
238-
//private int _index;
239282
internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
240283
{
241284
ContractUtils.RequiresNotNull(name, nameof(name));
@@ -244,8 +287,8 @@ internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, b
244287
StringBuilder sb = new StringBuilder(name);
245288
if (!preserveName)
246289
{
247-
int index = RT.nextID(); //Interlocked.Increment(ref _index);
248-
sb.Append('$');
290+
int index = RT.nextID();
291+
sb.Append("$");
249292
sb.Append(index);
250293
}
251294

@@ -255,15 +298,59 @@ internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, b
255298
sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_');
256299

257300
name = sb.ToString();
258-
return /* _myModule */ _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
301+
302+
return _assemblyGen.ModuleBuilder.DefineType(name, attr, parent);
303+
}
304+
305+
306+
public Type MakeDelegateType(string name, Type[] parameters, Type returnType)
307+
{
308+
TypeBuilder builder = DefineType(name, typeof(MulticastDelegate), DelegateAttributes, false);
309+
var ctor = builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature);
310+
var method = builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters);
311+
312+
#if NET9_0_OR_GREATER
313+
314+
if ( _assemblyGen.AssemblyBuilder is PersistedAssemblyBuilder)
315+
{
316+
// We cannot call SetImplementationFlags on a PersistedAssemblyBuilder -- trhows an error.
317+
// Without doing this, we get a different error = .ctor does not have a body.
318+
// That's be cause the MethodImplAttributes.Runtime flag indicates that the runtime should provide the implementation.
319+
// Since we can't specify that the runtime should define the constructor body, we'll have to do it ourselves.
320+
// Basically, all the superclass contstructor and return.
321+
322+
////var baseCtor = typeof(MulticastDelegate).GetConstructor(_DelegateCtorSignature);
323+
////var allBaseCtors = typeof(MulticastDelegate).GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
324+
//CljILGen genCtor = new CljILGen(ctor.GetILGenerator());
325+
////gen.EmitLoadArg(0);
326+
////gen.EmitLoadArg(1);
327+
////gen.EmitLoadArg(2);
328+
////gen.Emit(OpCodes.Call, baseCtor);
329+
//genCtor.Emit(OpCodes.Ret);
330+
331+
ctor.SetImplementationFlags(ImplAttributes);
332+
method.SetImplementationFlags(ImplAttributes);
333+
}
334+
else
335+
{
336+
ctor.SetImplementationFlags(ImplAttributes);
337+
method.SetImplementationFlags(ImplAttributes);
338+
}
339+
#else
340+
ctor.SetImplementationFlags(ImplAttributes);
341+
method.SetImplementationFlags(ImplAttributes);
342+
#endif
343+
344+
return builder.CreateTypeInfo();
259345
}
346+
260347
private const MethodAttributes CtorAttributes = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
261348
private const MethodImplAttributes ImplAttributes = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
262349
private const MethodAttributes InvokeAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
263350
private const TypeAttributes DelegateAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
264-
private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(nint) };
351+
private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(IntPtr) };
265352

266-
#endregion
353+
#endregion
267354

268355
#region Finalizing
269356

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ private static GenContext CreateGenContext(AssemblyType assemblyType, string sou
159159
private GenContext(AssemblyType assemblyType, string directory, AssemblyName aname, string extension, bool createDynInitHelper, string sourceName)
160160
{
161161
// TODO: Make this settable from a *debug* flag
162+
163+
Console.WriteLine($"Creating GenContext for {aname.Name}, {sourceName}");
162164
#if DEBUG
163165
_isDebuggable = true;
164166
#else

0 commit comments

Comments
 (0)