Author: miguel
Date: 2008-01-21 01:14:06 -0500 (Mon, 21 Jan 2008)
New Revision: 93370

Modified:
   trunk/mcs/class/System.Core/System.Linq.Expressions/BinaryExpression.cs
Log:
Improve this, still wrong

Modified: 
trunk/mcs/class/System.Core/System.Linq.Expressions/BinaryExpression.cs
===================================================================
--- trunk/mcs/class/System.Core/System.Linq.Expressions/BinaryExpression.cs     
2008-01-21 06:05:28 UTC (rev 93369)
+++ trunk/mcs/class/System.Core/System.Linq.Expressions/BinaryExpression.cs     
2008-01-21 06:14:06 UTC (rev 93370)
@@ -267,17 +267,15 @@
                        ig.Emit (opcode);
 
                        if (IsLifted){
+                               ig.Emit (OpCodes.Newobj, 
left.Type.GetConstructors ()[0]);
+
                                Label skip = ig.DefineLabel ();
                                ig.Emit (OpCodes.Br, skip);
                                ig.MarkLabel (empty_value.Value);
                                ig.Emit (OpCodes.Ldloc, ret);
                                ig.Emit (OpCodes.Initobj, Type);
-                               Label end = ig.DefineLabel ();
-                               ig.Emit (OpCodes.Br, end);
                                
                                ig.MarkLabel (skip);
-                               ig.Emit (OpCodes.Newobj, 
left.Type.GetConstructors ()[0]);
-                               ig.MarkLabel (end);
                        }
                }
        }

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to