Sane stack transitional behaviour in bodies

Author: hagane

ngc/ClrGenerator.fs

@@ -82,10 +82,8 @@ type ClrCallGenerator(context : Context, typeBuilder : TypeBuilder, clrType : Ty
 
             args_seq.Generate ilGen            
             ilGen.Emit(OpCodes.Call, Option.get clrMethod)
-            if (Option.get clrMethod).ReturnType = typeof<Void> then
-                ilGen.Emit(OpCodes.Ldnull);
         member this.ReturnTypes() =
-            if (Option.get clrMethod).ReturnType = typeof<Void> then [typeof<obj>] else [(Option.get clrMethod).ReturnType]
+            [(Option.get clrMethod).ReturnType]
 
 type InstanceCallGenerator(context : Context, typeBuilder : TypeBuilder, instance : SExp, methodName : string, arguments : SExp list, gf : IGeneratorFactory) =
     interface IGenerator with

ngc/FormGenerator.fs

@@ -86,7 +86,7 @@ type BodyGenerator(context:Context,typeBuilder:TypeBuilder,body:SExp list, gf:IG
                 let gen = gf.MakeGenerator context last
                 let val_type = gen.ReturnTypes()
                 gen.Generate ilGen
-                if (val_type = [typeof<System.Void>]) then
+                if ((List.head val_type) = typeof<System.Void>) then
                     ilGen.Emit(OpCodes.Ldnull)
             | sexp :: rest ->
                 let gen = gf.MakeGenerator context sexp