Call to CodeMethod returning void should work (PowerShell#4850)

Fixes PowerShell#4826

Author: Staffan Gustafsson

src/System.Management.Automation/engine/runtime/Binding/Binders.cs

@@ -6568,9 +6568,16 @@ public override DynamicMetaObject FallbackInvokeMember(DynamicMetaObject target,
             var codeMethod = methodInfo as PSCodeMethod;
             if (codeMethod != null)
             {
-                return new DynamicMetaObject(
-                    InvokeMethod(codeMethod.CodeReference, null, args.Prepend(target).ToArray(), false, MethodInvocationType.Ordinary)
-                    .Cast(typeof(object)), restrictions).WriteToDebugLog(this);
+                Expression expr = InvokeMethod(codeMethod.CodeReference, null, args.Prepend(target).ToArray(), false, MethodInvocationType.Ordinary);
+                if (codeMethod.CodeReference.ReturnType == typeof(void))
+                {
+                    expr = Expression.Block(expr, ExpressionCache.AutomationNullConstant);
+                }
+                else
+                {
+                    expr = expr.Cast(typeof(object));
+                }
+                return new DynamicMetaObject(expr, restrictions).WriteToDebugLog(this);
             }
 
             var parameterizedProperty = methodInfo as PSParameterizedProperty;

test/powershell/engine/ETS/Adapter.Tests.ps1

@@ -79,6 +79,39 @@ Describe "Adapter Tests" -tags "CI" {
         $val  = $doc.ToString()
         $val | Should Be "book"
     }
+
+    It "Calls CodeMethod with void result" {
+
+        class TestCodeMethodInvokationWithVoidReturn {
+            [int] $CallCounter
+
+            static [int] IntMethodCM([PSObject] $self) {
+                return $self.CallCounter
+            }
+
+            static [void] VoidMethodCM([PSObject] $self) {
+                $self.CallCounter++
+            }
+
+            static [Reflection.MethodInfo] GetMethodInfo([string] $name) {
+                return [TestCodeMethodInvokationWithVoidReturn].GetMethod($name)
+            }
+        }
+
+        Update-TypeData -Force -TypeName TestCodeMethodInvokationWithVoidReturn -MemberType CodeMethod -MemberName IntMethod -Value ([TestCodeMethodInvokationWithVoidReturn]::GetMethodInfo('IntMethodCM'))
+        Update-TypeData -Force -TypeName TestCodeMethodInvokationWithVoidReturn -MemberType CodeMethod -MemberName VoidMethod -Value ([TestCodeMethodInvokationWithVoidReturn]::GetMethodInfo('VoidMethodCM'))
+        try {
+            $o = [TestCodeMethodInvokationWithVoidReturn]::new()
+            $o.CallCounter | Should Be 0
+            $o.VoidMethod()
+            $o.CallCounter | Should be 1
+
+            $o.IntMethod() | Should be 1
+        }
+        finally {
+            Remove-TypeData TestCodeMethodInvokationWithVoidReturn
+        }
+    }
 }
 
 Describe "Adapter XML Tests" -tags "CI" {