Skip to content

Commit 093917b

Browse files
dmillerdmiller
committed
Wire up MyAssemblyGen and MyTypeGen conditionally by platform, do some type hacking, enable assembly saving in .net 9
1 parent 6cba84d commit 093917b

File tree

9 files changed

+195
-49
lines changed

9 files changed

+195
-49
lines changed

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

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

11-
/**
12-
* Author: David Miller
13-
**/
14-
15-
1611
using System;
1712
using System.Reflection;
1813
using System.Reflection.Emit;
@@ -25,9 +20,17 @@ namespace clojure.lang.CljCompiler.Ast
2520
{
2621
public class CljILGen : ILGen
2722
{
23+
24+
private readonly ILGenerator _ilGenerator;
25+
public ILGenerator ILGenerator
26+
{
27+
get { return _ilGenerator; }
28+
}
29+
2830
public CljILGen(ILGenerator baseIlg)
2931
: base(baseIlg)
3032
{
33+
_ilGenerator = baseIlg;
3134
}
3235

3336
private static bool IsVolatile(FieldInfo fi)

‎Clojure/Clojure/CljCompiler/Ast/InvokeExpr.cs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,23 @@ public static Expr Parse(ParserContext pcon, ISeq form)
167167
int arity = RT.count(form.next());
168168
object sigtag = SigTag(arity, v);
169169
object vtag = RT.get(RT.meta(v), RT.TagKey);
170-
if (StaticInvokeExpr.Parse(v, RT.next(form), formTag ?? sigtag ?? vtag) is StaticInvokeExpr ret && !((Compiler.IsCompiling || Compiler.IsCompilingDefType) && GenContext.IsInternalAssembly(ret.Method.DeclaringType.Assembly)))
170+
//if (StaticInvokeExpr.Parse(v, RT.next(form), formTag ?? sigtag ?? vtag) is StaticInvokeExpr ret && !((Compiler.IsCompiling || Compiler.IsCompilingDefType) && GenContext.IsInternalAssembly(ret.Method.DeclaringType.Assembly)))
171+
//{
172+
// //Console.WriteLine("invoke direct: {0}", v);
173+
// return ret;
174+
//}
175+
////Console.WriteLine("NOT direct: {0}", v);
176+
if (StaticInvokeExpr.Parse(v, RT.next(form), formTag ?? sigtag ?? vtag) is StaticInvokeExpr ret)
171177
{
172-
//Console.WriteLine("invoke direct: {0}", v);
173-
return ret;
178+
var isCompiling = Compiler.IsCompiling || Compiler.IsCompilingDefType;
179+
var retAssembly = ret.Method.DeclaringType.Assembly;
180+
var isInternal = GenContext.IsInternalAssembly(retAssembly);
181+
if (!(isCompiling && isInternal))
182+
return ret;
174183
}
175-
//Console.WriteLine("NOT direct: {0}", v);
176184
}
177185
}
178-
186+
179187
if (varFexpr != null && pcon.Rhc != RHC.Eval)
180188
{
181189
Var v = varFexpr.Var;

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,23 @@ internal static ObjExpr Build(
166166

167167
ret._methodMap = overrideables;
168168

169-
169+
#if NETFRAMEWORK
170170
GenContext context = Compiler.IsCompiling
171171
? Compiler.CompilerContextVar.get() as GenContext
172172
: (ret.IsDefType
173173
? GenContext.CreateWithExternalAssembly("deftype" + RT.nextID().ToString(), ".dll", true)
174174
: (Compiler.CompilerContextVar.get() as GenContext
175175
??
176176
Compiler.EvalContext));
177+
#else
178+
GenContext context = Compiler.IsCompiling
179+
? Compiler.CompilerContextVar.get() as GenContext
180+
: (ret.IsDefType
181+
? GenContext.CreateWithInternalAssembly("deftype" + RT.nextID().ToString(), true)
182+
: (Compiler.CompilerContextVar.get() as GenContext
183+
??
184+
Compiler.EvalContext));
185+
#endif
177186

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

@@ -436,7 +445,7 @@ private static bool ParametersMatch(MethodInfo m1, MethodInfo m2)
436445
// return t.FullName.Replace(',', '/');
437446
//}
438447

439-
#endregion
448+
#endregion
440449

441450
#region Method reflection
442451

‎Clojure/Clojure/CljCompiler/Ast/StaticInvokeExpr.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
**/
1414

1515
using System;
16+
using System.Collections.Generic;
1617
using System.Reflection;
1718
using System.Reflection.Emit;
1819

@@ -83,6 +84,15 @@ public static Expr Parse(Var v, ISeq args, object tag)
8384

8485
Type target = v.get().GetType();
8586

87+
{
88+
var directLinkMap = Compiler.DirectLinkingMapVar.deref() as Dictionary<Var, Type>;
89+
if (directLinkMap != null && directLinkMap.TryGetValue(v, out Type t))
90+
{
91+
if (t != null)
92+
target = t;
93+
}
94+
}
95+
8696
MethodInfo[] allMethods = target.GetMethods();
8797
bool variadic = false;
8898
int argcount = RT.count(args);

‎Clojure/Clojure/CljCompiler/Compiler.cs‎

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ internal static int ColumnVarDeref()
193193

194194
internal static readonly Var CompilerContextVar = Var.create(null).setDynamic();
195195
internal static readonly Var CompilerActiveVar = Var.create(false).setDynamic();
196-
196+
internal static readonly Var DirectLinkingMapVar = Var.create(null).setDynamic();
197+
197198
public static Var CompilerOptionsVar;
198199

199200
public static object GetCompilerOption(Keyword k)
@@ -1687,7 +1688,8 @@ public static object Compile(GenContext context,TextReader rdr, string sourceDir
16871688
RT.WarnOnReflectionVar, RT.WarnOnReflectionVar.deref(),
16881689
RT.DataReadersVar, RT.DataReadersVar.deref(),
16891690
CompilerContextVar, context,
1690-
CompilerActiveVar, true
1691+
CompilerActiveVar, true,
1692+
DirectLinkingMapVar, new Dictionary<Var, Type>()
16911693
));
16921694

16931695
try
@@ -1772,7 +1774,17 @@ private static void Compile1(TypeBuilder tb, CljILGen ilg, ObjExpr objx, object
17721774
objx.EmitConstantFieldDefs(tb);
17731775
expr.Emit(RHC.Expression,objx,ilg);
17741776
ilg.Emit(OpCodes.Pop);
1777+
1778+
if (expr is DefExpr dex && dex.Init is FnExpr fnx)
1779+
{
1780+
((Dictionary<Var, Type>)DirectLinkingMapVar.deref())[dex.Var] = fnx.CompiledType;
1781+
}
1782+
1783+
#if NET9_0_OR_GREATER
1784+
DoSeparateEval(evPC, form);
1785+
#else
17751786
expr.Eval();
1787+
#endif
17761788
}
17771789
}
17781790
finally
@@ -1781,8 +1793,40 @@ private static void Compile1(TypeBuilder tb, CljILGen ilg, ObjExpr objx, object
17811793
}
17821794
}
17831795

1796+
private static void DoSeparateEval(ParserContext evPC, Object form)
1797+
{
1798+
// Reset the environment to avoid leaking the compile environment
1799+
1800+
Var.pushThreadBindings(RT.mapUniqueKeys(
1801+
MethodVar, null,
1802+
LocalEnvVar, null,
1803+
LoopLocalsVar, null,
1804+
NextLocalNumVar, 0,
1805+
//RT.ReadEvalVar, true /* RT.T */,
1806+
//RT.CurrentNSVar, RT.CurrentNSVar.deref(), Do not reset this -- we need to see changes to this that might happen, e.g. with (ns ..) or (in-ns ...) calls
1807+
ConstantsVar, PersistentVector.EMPTY,
1808+
ConstantIdsVar, new IdentityHashMap(),
1809+
KeywordsVar, PersistentHashMap.EMPTY,
1810+
VarsVar, PersistentHashMap.EMPTY,
1811+
//RT.UncheckedMathVar, RT.UncheckedMathVar.deref(),
1812+
//RT.WarnOnReflectionVar, RT.WarnOnReflectionVar.deref(),
1813+
//RT.DataReadersVar, RT.DataReadersVar.deref(),
1814+
CompilerContextVar, null,
1815+
CompilerActiveVar, false,
1816+
DirectLinkingMapVar, null // we do not want to have the evaluated version try to direct link to functions in the compile assembly
1817+
));
1818+
try
1819+
{
1820+
Compiler.eval(form);
1821+
}
1822+
finally
1823+
{
1824+
Var.popThreadBindings();
1825+
}
1826+
}
1827+
17841828
#endregion
1785-
1829+
17861830
#region Loading
17871831

17881832
internal static void LoadAssembly(FileInfo assyInfo, string relativePath)

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
using System.Runtime.CompilerServices;
3030
using System.Text;
3131

32+
#if NETFRAMEWORK
33+
using AssemblyGenT = Microsoft.Scripting.Generation.AssemblyGen;
34+
using TypeGenT = Microsoft.Scripting.Generation.TypeGen;
35+
#else
36+
using AssemblyGenT = clojure.lang.CljCompiler.Context.MyAssemblyGen;
37+
using TypeGenT = clojure.lang.CljCompiler.Context.MyTypeGen;
38+
#endif
39+
3240
namespace clojure.lang.CljCompiler.Context
3341
{
3442

@@ -37,9 +45,9 @@ class DynInitHelper
3745
#region Data
3846

3947
int _id;
40-
readonly AssemblyGen _assemblyGen;
48+
readonly AssemblyGenT _assemblyGen;
4149
TypeBuilder _typeBuilder;
42-
TypeGen _typeGen;
50+
TypeGenT _typeGen;
4351

4452
readonly string _typeName;
4553

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

6977
#region Ctors and factories
7078

71-
public DynInitHelper(AssemblyGen ag, string typeName)
79+
public DynInitHelper(AssemblyGenT ag, string typeName)
7280
{
7381
_assemblyGen = ag;
7482
_typeName = typeName;
@@ -116,13 +124,13 @@ private void MaybeInit()
116124
if (_typeBuilder == null)
117125
{
118126
_typeBuilder = _assemblyGen.DefinePublicType(_typeName, typeof(object), true);
119-
_typeGen = new TypeGen(_assemblyGen, _typeBuilder);
127+
_typeGen = new TypeGenT(_assemblyGen, _typeBuilder);
120128
_siteInfos = new List<SiteInfo>();
121129
}
122130
}
123131

124132

125-
private Expression RewriteCallSite(CallSite site, TypeGen tg, Type delegateType, out SiteInfo siteInfo)
133+
private Expression RewriteCallSite(CallSite site, TypeGenT tg, Type delegateType, out SiteInfo siteInfo)
126134
{
127135
if (!(site.Binder is IExpressionSerializable))
128136
{

0 commit comments

Comments
 (0)