Use CallerArgumentExpression on Requires.NotNull (PowerShell#19200)

xtqqczze · web-flow · commit 6055a82f6b11 · 2023-02-23T10:21:38.000-08:00
diff --git a/src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs b/src/System.Management.Automation/engine/ComInterop/BoundDispEvent.cs
@@ -73,7 +73,7 @@ private static void VerifyHandler(object handler)
         /// <returns>The original event with handler added.</returns>
         private object InPlaceAdd(object handler)
         {
-            Requires.NotNull(handler, nameof(handler));
+            Requires.NotNull(handler);
             VerifyHandler(handler);
 
             ComEventsSink comEventSink = ComEventsSink.FromRuntimeCallableWrapper(_rcw, _sourceIid, true);
@@ -88,7 +88,7 @@ private object InPlaceAdd(object handler)
         /// <returns>The original event with handler removed.</returns>
         private object InPlaceSubtract(object handler)
         {
-            Requires.NotNull(handler, nameof(handler));
+            Requires.NotNull(handler);
             VerifyHandler(handler);
 
             ComEventsSink comEventSink = ComEventsSink.FromRuntimeCallableWrapper(_rcw, _sourceIid, false);
diff --git a/src/System.Management.Automation/engine/ComInterop/ComBinder.cs b/src/System.Management.Automation/engine/ComInterop/ComBinder.cs
@@ -35,8 +35,8 @@ public static bool IsComObject(object value)
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryBindGetMember(GetMemberBinder binder, DynamicMetaObject instance, out DynamicMetaObject result, bool delayInvocation)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
 
             if (TryGetMetaObject(ref instance))
             {
@@ -66,9 +66,9 @@ public static bool TryBindGetMember(GetMemberBinder binder, DynamicMetaObject in
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryBindSetMember(SetMemberBinder binder, DynamicMetaObject instance, DynamicMetaObject value, out DynamicMetaObject result)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
-            Requires.NotNull(value, nameof(value));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
+            Requires.NotNull(value);
 
             if (TryGetMetaObject(ref instance))
             {
@@ -91,9 +91,9 @@ public static bool TryBindSetMember(SetMemberBinder binder, DynamicMetaObject in
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryBindInvoke(InvokeBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
-            Requires.NotNull(args, nameof(args));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
+            Requires.NotNull(args);
 
             if (TryGetMetaObjectInvoke(ref instance))
             {
@@ -116,9 +116,9 @@ public static bool TryBindInvoke(InvokeBinder binder, DynamicMetaObject instance
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryBindInvokeMember(InvokeMemberBinder binder, bool isSetProperty, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
-            Requires.NotNull(args, nameof(args));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
+            Requires.NotNull(args);
 
             if (TryGetMetaObject(ref instance))
             {
@@ -158,9 +158,9 @@ public static bool TryBindInvokeMember(InvokeMemberBinder binder, bool isSetProp
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryBindGetIndex(GetIndexBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, out DynamicMetaObject result)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
-            Requires.NotNull(args, nameof(args));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
+            Requires.NotNull(args);
 
             if (TryGetMetaObjectInvoke(ref instance))
             {
@@ -183,10 +183,10 @@ public static bool TryBindGetIndex(GetIndexBinder binder, DynamicMetaObject inst
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryBindSetIndex(SetIndexBinder binder, DynamicMetaObject instance, DynamicMetaObject[] args, DynamicMetaObject value, out DynamicMetaObject result)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
-            Requires.NotNull(args, nameof(args));
-            Requires.NotNull(value, nameof(value));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
+            Requires.NotNull(args);
+            Requires.NotNull(value);
 
             if (TryGetMetaObjectInvoke(ref instance))
             {
@@ -208,8 +208,8 @@ public static bool TryBindSetIndex(SetIndexBinder binder, DynamicMetaObject inst
         /// <returns>True if operation was bound successfully; otherwise, false.</returns>
         public static bool TryConvert(ConvertBinder binder, DynamicMetaObject instance, out DynamicMetaObject result)
         {
-            Requires.NotNull(binder, nameof(binder));
-            Requires.NotNull(instance, nameof(instance));
+            Requires.NotNull(binder);
+            Requires.NotNull(instance);
 
             if (IsComObject(instance.Value))
             {
@@ -245,7 +245,7 @@ public static bool TryConvert(ConvertBinder binder, DynamicMetaObject instance,
         /// <returns>The collection of member names.</returns>
         internal static IList<string> GetDynamicDataMemberNames(object value)
         {
-            Requires.NotNull(value, nameof(value));
+            Requires.NotNull(value);
             Requires.Condition(IsComObject(value), nameof(value));
 
             return ComObject.ObjectToComObject(value).GetMemberNames(true);
@@ -260,7 +260,7 @@ internal static IList<string> GetDynamicDataMemberNames(object value)
         /// <returns>The collection of pairs that represent data member's names and their data.</returns>
         internal static IList<KeyValuePair<string, object>> GetDynamicDataMembers(object value, IEnumerable<string> names)
         {
-            Requires.NotNull(value, nameof(value));
+            Requires.NotNull(value);
             Requires.Condition(IsComObject(value), nameof(value));
 
             return ComObject.ObjectToComObject(value).GetMembers(names);
diff --git a/src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs b/src/System.Management.Automation/engine/ComInterop/ComFallbackMetaObject.cs
@@ -23,31 +23,31 @@ internal ComFallbackMetaObject(Expression expression, BindingRestrictions restri
 
         public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.FallbackGetIndex(UnwrapSelf(), indexes);
         }
 
         public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.FallbackSetIndex(UnwrapSelf(), indexes, value);
         }
 
         public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.FallbackGetMember(UnwrapSelf());
         }
 
         public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.FallbackInvokeMember(UnwrapSelf(), args);
         }
 
         public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.FallbackSetMember(UnwrapSelf(), value);
         }
 
diff --git a/src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs b/src/System.Management.Automation/engine/ComInterop/ComMetaObject.cs
@@ -16,37 +16,37 @@ internal ComMetaObject(Expression expression, BindingRestrictions restrictions,
 
         public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.Defer(args.AddFirst(WrapSelf()));
         }
 
         public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.Defer(args.AddFirst(WrapSelf()));
         }
 
         public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.Defer(WrapSelf());
         }
 
         public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.Defer(WrapSelf(), value);
         }
 
         public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.Defer(WrapSelf(), indexes);
         }
 
         public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
             return binder.Defer(WrapSelf(), indexes.AddLast(value));
         }
 
diff --git a/src/System.Management.Automation/engine/ComInterop/Helpers.cs b/src/System.Management.Automation/engine/ComInterop/Helpers.cs
@@ -1,8 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#nullable enable
+
 using System;
 using System.Linq.Expressions;
+using System.Runtime.CompilerServices;
 
 namespace System.Management.Automation.ComInterop
 {
@@ -33,7 +36,7 @@ internal static Expression Convert(Expression expression, Type type)
     internal static class Requires
     {
         [System.Diagnostics.Conditional("DEBUG")]
-        internal static void NotNull(object value, string paramName)
+        internal static void NotNull(object value, [CallerArgumentExpression("value")] string? paramName = null)
         {
             ArgumentNullException.ThrowIfNull(value, paramName);
         }
diff --git a/src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs b/src/System.Management.Automation/engine/ComInterop/IDispatchMetaObject.cs
@@ -23,7 +23,7 @@ internal IDispatchMetaObject(Expression expression, IDispatchComObject self)
 
         public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
 
             ComMethodDesc method = null;
 
@@ -63,7 +63,7 @@ public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, Dy
 
         public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
 
             if (_self.TryGetGetItem(out ComMethodDesc method))
             {
@@ -108,7 +108,7 @@ public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
             ComBinder.ComGetMemberBinder comBinder = binder as ComBinder.ComGetMemberBinder;
             bool canReturnCallables = comBinder?._canReturnCallables ?? false;
 
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
 
             // 1. Try methods
             if (_self.TryGetMemberMethod(binder.Name, out ComMethodDesc method))
@@ -187,7 +187,7 @@ private DynamicMetaObject BindEvent(ComEventDesc eventDesc)
 
         public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
 
             if (_self.TryGetGetItem(out ComMethodDesc getItem))
             {
@@ -203,7 +203,7 @@ public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMet
 
         public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
 
             if (_self.TryGetSetItem(out ComMethodDesc setItem))
             {
@@ -238,7 +238,7 @@ public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMet
 
         public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
         {
-            Requires.NotNull(binder, nameof(binder));
+            Requires.NotNull(binder);
 
             return
                 // 1. Check for simple property put

Original file line number	Diff line number	Diff line change
`@@ -23,31 +23,31 @@ internal ComFallbackMetaObject(Expression expression, BindingRestrictions restri`
`23`	`23`
`24`	`24`	`public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)`
`25`	`25`	`{`
`26`		`- Requires.NotNull(binder, nameof(binder));`
	`26`	`+ Requires.NotNull(binder);`
`27`	`27`	`return binder.FallbackGetIndex(UnwrapSelf(), indexes);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)`
`31`	`31`	`{`
`32`		`- Requires.NotNull(binder, nameof(binder));`
	`32`	`+ Requires.NotNull(binder);`
`33`	`33`	`return binder.FallbackSetIndex(UnwrapSelf(), indexes, value);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public override DynamicMetaObject BindGetMember(GetMemberBinder binder)`
`37`	`37`	`{`
`38`		`- Requires.NotNull(binder, nameof(binder));`
	`38`	`+ Requires.NotNull(binder);`
`39`	`39`	`return binder.FallbackGetMember(UnwrapSelf());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)`
`43`	`43`	`{`
`44`		`- Requires.NotNull(binder, nameof(binder));`
	`44`	`+ Requires.NotNull(binder);`
`45`	`45`	`return binder.FallbackInvokeMember(UnwrapSelf(), args);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)`
`49`	`49`	`{`
`50`		`- Requires.NotNull(binder, nameof(binder));`
	`50`	`+ Requires.NotNull(binder);`
`51`	`51`	`return binder.FallbackSetMember(UnwrapSelf(), value);`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -16,37 +16,37 @@ internal ComMetaObject(Expression expression, BindingRestrictions restrictions,`
`16`	`16`
`17`	`17`	`public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)`
`18`	`18`	`{`
`19`		`- Requires.NotNull(binder, nameof(binder));`
	`19`	`+ Requires.NotNull(binder);`
`20`	`20`	`return binder.Defer(args.AddFirst(WrapSelf()));`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)`
`24`	`24`	`{`
`25`		`- Requires.NotNull(binder, nameof(binder));`
	`25`	`+ Requires.NotNull(binder);`
`26`	`26`	`return binder.Defer(args.AddFirst(WrapSelf()));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public override DynamicMetaObject BindGetMember(GetMemberBinder binder)`
`30`	`30`	`{`
`31`		`- Requires.NotNull(binder, nameof(binder));`
	`31`	`+ Requires.NotNull(binder);`
`32`	`32`	`return binder.Defer(WrapSelf());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)`
`36`	`36`	`{`
`37`		`- Requires.NotNull(binder, nameof(binder));`
	`37`	`+ Requires.NotNull(binder);`
`38`	`38`	`return binder.Defer(WrapSelf(), value);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)`
`42`	`42`	`{`
`43`		`- Requires.NotNull(binder, nameof(binder));`
	`43`	`+ Requires.NotNull(binder);`
`44`	`44`	`return binder.Defer(WrapSelf(), indexes);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)`
`48`	`48`	`{`
`49`		`- Requires.NotNull(binder, nameof(binder));`
	`49`	`+ Requires.NotNull(binder);`
`50`	`50`	`return binder.Defer(WrapSelf(), indexes.AddLast(value));`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,11 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
	`4`	`+#nullable enable`
	`5`	`+`
`4`	`6`	`using System;`
`5`	`7`	`using System.Linq.Expressions;`
	`8`	`+using System.Runtime.CompilerServices;`
`6`	`9`
`7`	`10`	`namespace System.Management.Automation.ComInterop`
`8`	`11`	`{`
`@@ -33,7 +36,7 @@ internal static Expression Convert(Expression expression, Type type)`
`33`	`36`	`internal static class Requires`
`34`	`37`	`{`
`35`	`38`	`[System.Diagnostics.Conditional("DEBUG")]`
`36`		`- internal static void NotNull(object value, string paramName)`
	`39`	`+ internal static void NotNull(object value, [CallerArgumentExpression("value")] string? paramName = null)`
`37`	`40`	`{`
`38`	`41`	`ArgumentNullException.ThrowIfNull(value, paramName);`
`39`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ internal IDispatchMetaObject(Expression expression, IDispatchComObject self)`
`23`	`23`
`24`	`24`	`public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, DynamicMetaObject[] args)`
`25`	`25`	`{`
`26`		`- Requires.NotNull(binder, nameof(binder));`
	`26`	`+ Requires.NotNull(binder);`
`27`	`27`
`28`	`28`	`ComMethodDesc method = null;`
`29`	`29`
`@@ -63,7 +63,7 @@ public override DynamicMetaObject BindInvokeMember(InvokeMemberBinder binder, Dy`
`63`	`63`
`64`	`64`	`public override DynamicMetaObject BindInvoke(InvokeBinder binder, DynamicMetaObject[] args)`
`65`	`65`	`{`
`66`		`- Requires.NotNull(binder, nameof(binder));`
	`66`	`+ Requires.NotNull(binder);`
`67`	`67`
`68`	`68`	`if (_self.TryGetGetItem(out ComMethodDesc method))`
`69`	`69`	`{`
`@@ -108,7 +108,7 @@ public override DynamicMetaObject BindGetMember(GetMemberBinder binder)`
`108`	`108`	`ComBinder.ComGetMemberBinder comBinder = binder as ComBinder.ComGetMemberBinder;`
`109`	`109`	`bool canReturnCallables = comBinder?._canReturnCallables ?? false;`
`110`	`110`
`111`		`- Requires.NotNull(binder, nameof(binder));`
	`111`	`+ Requires.NotNull(binder);`
`112`	`112`
`113`	`113`	`// 1. Try methods`
`114`	`114`	`if (_self.TryGetMemberMethod(binder.Name, out ComMethodDesc method))`
`@@ -187,7 +187,7 @@ private DynamicMetaObject BindEvent(ComEventDesc eventDesc)`
`187`	`187`
`188`	`188`	`public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMetaObject[] indexes)`
`189`	`189`	`{`
`190`		`- Requires.NotNull(binder, nameof(binder));`
	`190`	`+ Requires.NotNull(binder);`
`191`	`191`
`192`	`192`	`if (_self.TryGetGetItem(out ComMethodDesc getItem))`
`193`	`193`	`{`
`@@ -203,7 +203,7 @@ public override DynamicMetaObject BindGetIndex(GetIndexBinder binder, DynamicMet`
`203`	`203`
`204`	`204`	`public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMetaObject[] indexes, DynamicMetaObject value)`
`205`	`205`	`{`
`206`		`- Requires.NotNull(binder, nameof(binder));`
	`206`	`+ Requires.NotNull(binder);`
`207`	`207`
`208`	`208`	`if (_self.TryGetSetItem(out ComMethodDesc setItem))`
`209`	`209`	`{`
`@@ -238,7 +238,7 @@ public override DynamicMetaObject BindSetIndex(SetIndexBinder binder, DynamicMet`
`238`	`238`
`239`	`239`	`public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)`
`240`	`240`	`{`
`241`		`- Requires.NotNull(binder, nameof(binder));`
	`241`	`+ Requires.NotNull(binder);`
`242`	`242`
`243`	`243`	`return`
`244`	`244`	`// 1. Check for simple property put`