2008-11-19 Jb Evain <jbevain@novell.com>

[mono.git] / mcs / class / System.Core / System.Linq.Expressions / TypeBinaryExpression.cs

diff --git a/mcs/class/System.Core/System.Linq.Expressions/TypeBinaryExpression.cs b/mcs/class/System.Core/System.Linq.Expressions/TypeBinaryExpression.cs
index 3e256ffaf3f284c2b8041061888620757f43bc7b..4463e4e8b29a754f90933b0e66db17edd3e3bacb 100644 (file)
--- a/mcs/class/System.Core/System.Linq.Expressions/TypeBinaryExpression.cs
+++ b/mcs/class/System.Core/System.Linq.Expressions/TypeBinaryExpression.cs
@@ -53,12 +53,15 @@ namespace System.Linq.Expressions {
 
                internal override void Emit (EmitContext ec)
                {
-                       expression.Emit (ec);
+                       if (expression.Type == typeof (void)) {
+                               ec.ig.Emit (OpCodes.Ldc_I4_0);
+                               return;
+                       }
 
-                       var ig = ec.ig;
-                       ig.Emit (OpCodes.Isinst, type_operand);
-                       ig.Emit (OpCodes.Ldnull);
-                       ig.Emit (OpCodes.Cgt_Un);
+                       ec.EmitIsInst (expression, type_operand);
+
+                       ec.ig.Emit (OpCodes.Ldnull);
+                       ec.ig.Emit (OpCodes.Cgt_Un);
                }
        }
 }