Merge pull request #487 from mayerwin/patch-1

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

diff --git a/mcs/class/System.Core/System.Linq.Expressions/ConditionalExpression.cs b/mcs/class/System.Core/System.Linq.Expressions/ConditionalExpression.cs
index 554bffd234cf8e0154d9f6a061e72210d126a780..6d6d5dd60eca27dfa7da896d430566048555c914 100644 (file)
--- a/mcs/class/System.Core/System.Linq.Expressions/ConditionalExpression.cs
+++ b/mcs/class/System.Core/System.Linq.Expressions/ConditionalExpression.cs
@@ -27,33 +27,54 @@
 //
 
 using System;
+using System.Reflection.Emit;
 
 namespace System.Linq.Expressions {
 
        public sealed class ConditionalExpression : Expression {
 
                Expression test;
-               Expression ifTrue;
-               Expression ifFalse;
+               Expression if_true;
+               Expression if_false;
 
                public Expression Test {
                        get { return test; }
                }
 
                public Expression IfTrue {
-                       get { return ifTrue; }
+                       get { return if_true; }
                }
 
                public Expression IfFalse {
-                       get { return ifFalse; }
+                       get { return if_false; }
                }
 
-               internal ConditionalExpression (Expression test, Expression ifTrue, Expression ifFalse)
-                       : base (ExpressionType.Conditional, ifTrue.Type)
+               internal ConditionalExpression (Expression test, Expression if_true, Expression if_false)
+                       : base (ExpressionType.Conditional, if_true.Type)
                {
                        this.test = test;
-                       this.ifTrue = ifTrue;
-                       this.ifFalse = ifFalse;
+                       this.if_true = if_true;
+                       this.if_false = if_false;
                }
+
+#if !FULL_AOT_RUNTIME
+               internal override void Emit (EmitContext ec)
+               {
+                       var ig = ec.ig;
+                       var false_target = ig.DefineLabel ();
+                       var end_target = ig.DefineLabel ();
+
+                       test.Emit (ec);
+                       ig.Emit (OpCodes.Brfalse, false_target);
+
+                       if_true.Emit (ec);
+                       ig.Emit (OpCodes.Br, end_target);
+
+                       ig.MarkLabel (false_target);
+                       if_false.Emit (ec);
+
+                       ig.MarkLabel (end_target);
+               }
+#endif
        }
 }