Code improvements in (Instance/Static/)MethodExpr and Reflector.

dmiller · dmiller · commit 0eae96002224 · 2025-10-29T11:11:21.000-04:00
diff --git a/Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs b/Clojure/Clojure/CljCompiler/Ast/InstanceMethodExpr.cs
@@ -8,15 +8,10 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-/**
- *   Author: David Miller
- **/
-
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 
-
 namespace clojure.lang.CljCompiler.Ast
 {
     public class InstanceMethodExpr : MethodExpr
@@ -48,7 +43,7 @@ public InstanceMethodExpr(
             _target = target;
             _qualifyingType = qualifyingType ?? (target.HasClrType ? target.ClrType : null);
 
-            if (target.HasClrType && target.ClrType == null)
+            if (target.HasClrType && target.ClrType is null)
                 throw new ArgumentException(String.Format("Attempt to call instance method {0} on nil", methodName));
 
             if (_qualifyingType != null)
@@ -94,9 +89,9 @@ public override object Eval()
                 object[] argvals = new object[_args.Count];
                 for (int i = 0; i < _args.Count; i++)
                     argvals[i] = _args[i].ArgExpr.Eval();
-                if (_method != null)
+                if (_method is not null)
                     return Reflector.InvokeMethod(_method, targetVal, argvals);
-                if (_qualifyingType != null)
+                if (_qualifyingType is not null)
                     return Reflector.CallInstanceMethod(_qualifyingType, _methodName, _typeArgs, targetVal, argvals);
                 else
                     return Reflector.CallInstanceMethod(_methodName, _typeArgs, targetVal, argvals);
@@ -115,17 +110,13 @@ public override object Eval()
 
         #region Type mangling
 
-        public override bool HasClrType
-        {
-            get { return _method != null || _tag != null; }
-        }
-
+        public override bool HasClrType => _method is not null || _tag is not null;
+   
         public override Type ClrType
         {
             get
             {
-                if (_cachedType == null)
-                    _cachedType = Compiler.RetType((_tag != null ? HostExpr.TagToType(_tag) : null), _method?.ReturnType);
+                _cachedType ??= Compiler.RetType((_tag is not null ? HostExpr.TagToType(_tag) : null), _method?.ReturnType);
                 return _cachedType;
             }
         }
diff --git a/Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs b/Clojure/Clojure/CljCompiler/Ast/MethodExpr.cs
@@ -78,7 +78,7 @@ public override void Emit(RHC rhc, ObjExpr objx, CljILGen ilg)
 
             Type retType;
 
-            if (_method != null)
+            if (_method is not null)
             {
                 EmitForMethod(objx, ilg);
                 retType = _method.ReturnType;
@@ -98,7 +98,7 @@ public override void EmitUnboxed(RHC rhc, ObjExpr objx, CljILGen ilg)
         {
             GenContext.EmitDebugInfo(ilg, _spanMap);
 
-            if (_method != null)
+            if (_method is not null)
             {
                 EmitForMethod(objx, ilg);
             }
@@ -144,7 +144,7 @@ private void EmitForMethod(ObjExpr objx, CljILGen ilg)
         }
         public static readonly MethodInfo Method_MethodExpr_GetDelegate = typeof(MethodExpr).GetMethod("GetDelegate");
 
-        public static readonly Dictionary<int, Delegate> DelegatesMap = new();
+        public static readonly Dictionary<int, Delegate> DelegatesMap = [];
 
         public static Delegate GetDelegate(int key)
         {
@@ -178,7 +178,7 @@ private void EmitComplexCall(ObjExpr objx, CljILGen ilg)
             {
                 i++;
                 Expr e = ha.ArgExpr;
-                Type argType = e.HasClrType && e.ClrType != null && e.ClrType.IsPrimitive ? e.ClrType : typeof(object);
+                Type argType = e.HasClrType && e.ClrType is not null && e.ClrType.IsPrimitive ? e.ClrType : typeof(object);
 
                 switch (ha.ParamType)
                 {
@@ -218,22 +218,27 @@ private void EmitComplexCall(ObjExpr objx, CljILGen ilg)
             // Unfortunately, the Expression.Dynamic method does not respect byRef parameters.
             // The workaround appears to be to roll your delegate type and then use Expression.MakeDynamic, as below.
 
-            List<Type> callsiteParamTypes = new(paramTypes.Count + 1)
-            {
-                typeof(System.Runtime.CompilerServices.CallSite)
-            };
-            callsiteParamTypes.AddRange(paramTypes);
+            List<Type> callsiteParamTypes =
+            [
+                typeof(System.Runtime.CompilerServices.CallSite), .. paramTypes
+            ];
 
             // PLAN9: Seeing if replacing this helps.
             //Type dynType = Microsoft.Scripting.Generation.Snippets.Shared.DefineDelegate("__interop__", returnType, callsiteParamTypes.ToArray());
             GenContext context = Compiler.CompilerContextVar.deref() as GenContext;
-            DynInitHelper dih = context?.DynInitHelper;
-            if (dih is null)
-                throw new InvalidOperationException("Don't know how to handle callsite in this case");
-            Type dynType = dih.MakeDelegateType("__interop__", callsiteParamTypes.ToArray(), returnType);
+            DynInitHelper dih = (context?.DynInitHelper) ?? throw new InvalidOperationException("Don't know how to handle callsite in this case");
+            Type dynType = dih.MakeDelegateType("__interop__", [.. callsiteParamTypes], returnType);
 
             DynamicExpression dyn = Expression.MakeDynamic(dynType, binder, paramExprs);
-            EmitDynamicCallPreamble(dyn, _spanMap, "__interop_" + _methodName + RT.nextID(), returnType, paramExprs, paramTypes.ToArray(), ilg, out Type delType, out MethodBuilder mbLambda);
+            EmitDynamicCallPreamble(dyn,
+                                    _spanMap,
+                                    "__interop_" + _methodName + RT.nextID(),
+                                    returnType,
+                                    paramExprs,
+                                    [.. paramTypes],
+                                    ilg,
+                                    out _,
+                                    out MethodBuilder mbLambda);
 
             //  Emit target + args
 
@@ -291,11 +296,11 @@ static FieldInfo GetCallSiteTarget(Type siteType)
         }
 
 
+#pragma warning disable IDE0060 // Remove unused parameter
         static public void EmitDynamicCallPreamble(DynamicExpression dyn, IPersistentMap spanMap, string methodName, Type returnType, IList<ParameterExpression> paramExprs, Type[] paramTypes, CljILGen ilg, out Type delType, out MethodBuilder mbLambda)
+#pragma warning restore IDE0060 // Remove unused parameter
         {
-            GenContext context = Compiler.CompilerContextVar.deref() as GenContext;
-
-            if (context is null || context.DynInitHelper is null)
+            if (Compiler.CompilerContextVar.deref() is not GenContext context || context.DynInitHelper is null)
                 throw new InvalidOperationException("Don't know how to handle callsite in this case");
 
             DynInitHelper.SiteInfo siteInfo = context.DynInitHelper.ComputeSiteInfo(dyn);
@@ -340,7 +345,6 @@ static public void EmitDynamicCallPreamble(DynamicExpression dyn, IPersistentMap
             ilg2.Emit(OpCodes.Ret);
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Standard API")]
         static public void EmitDynamicCallPostlude(MethodBuilder mbLambda, CljILGen ilg)
         {
             ilg.Emit(OpCodes.Call, mbLambda);
@@ -455,7 +459,7 @@ internal static void EmitConvertToType(CljILGen ilg, Type typeFrom, Type typeTo,
             //  If the DLR folks had made this method public (instead of internal), I could call it directly.
             //  Didn't feel like copying their code due to license/copyright.
 
-            MI_EmitConvertToType.Invoke(ilg, new Object[] { typeFrom, typeTo, isChecked });
+            MI_EmitConvertToType.Invoke(ilg, [typeFrom, typeTo, isChecked]);
         }
 
         #endregion
diff --git a/Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs b/Clojure/Clojure/CljCompiler/Ast/StaticMethodExpr.cs
@@ -75,17 +75,14 @@ public static bool IsBoxedMath(MethodBase m)
 
         #region Type mangling
 
-        public override bool HasClrType
-        {
-            get { return _method != null || _tag != null; }
-        }
+        public override bool HasClrType => _method is not null || _tag is not null; 
+
 
         public override Type ClrType
         {
             get
             {
-                if (_cachedType == null)
-                    _cachedType = Compiler.RetType((_tag != null) ? HostExpr.TagToType(_tag) : null, _method?.ReturnType);
+                _cachedType ??= Compiler.RetType((_tag != null) ? HostExpr.TagToType(_tag) : null, _method?.ReturnType);
                 return _cachedType;
             }
         }
@@ -101,7 +98,7 @@ public override object Eval()
                 object[] argvals = new object[_args.Count];
                 for (int i = 0; i < _args.Count; i++)
                     argvals[i] = _args[i].ArgExpr.Eval();
-                if (_method != null)
+                if (_method is not null)
                     return Reflector.InvokeMethod(_method, null, argvals);
                 return Reflector.CallStaticMethod(_methodName, _typeArgs, _type, argvals);
             }
@@ -119,10 +116,7 @@ public override object Eval()
 
         #region Code generation
 
-        protected override bool IsStaticCall
-        {
-            get { return true; }
-        }
+        protected override bool IsStaticCall => true;
 
         protected override void EmitTargetExpression(ObjExpr objx, CljILGen ilg)
         {
@@ -135,16 +129,14 @@ protected override Type GetTargetType()
             return typeof(Type);
         }
 
-        internal bool CanEmitIntrinsicPredicate()
-        {
-            return _method != null && Intrinsics.HasPred(_method);
-        }
+        internal bool CanEmitIntrinsicPredicate()  =>  _method is not null && Intrinsics.HasPred(_method);
+        
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Standard API")]
         internal void EmitIntrinsicPredicate(RHC rhc, ObjExpr objx, CljILGen ilg, Label falseLabel)
         {
             GenContext.EmitDebugInfo(ilg, _spanMap);
 
-            if (_method != null)
+            if (_method is not null)
             {
                 MethodExpr.EmitTypedArgs(objx, ilg, _method.GetParameters(), _args);
                 // JVM: clear locals
diff --git a/Clojure/Clojure/Runtime/Reflector.cs b/Clojure/Clojure/Runtime/Reflector.cs
