Merge pull request #498 from Unroll-Me/master
[mono.git] / mcs / class / System.Core / System.Linq.Expressions / BinaryExpression.cs
index ca9c17d7208dbb48fc750dbb622fe9f3faf03791..143f57513f47f7ba7c38307bf8729162d48b5d95 100644 (file)
@@ -87,7 +87,7 @@ namespace System.Linq.Expressions {
                }
 
                internal BinaryExpression (ExpressionType node_type, Type type, Expression left, Expression right, bool lift_to_null,
-                                          bool is_lifted, MethodInfo method, LambdaExpression conversion) : base (node_type, type)
+                       bool is_lifted, MethodInfo method, LambdaExpression conversion) : base (node_type, type)
                {
                        this.left = left;
                        this.right = right;
@@ -97,305 +97,381 @@ namespace System.Linq.Expressions {
                        this.is_lifted = is_lifted;
                }
 
-               void EmitMethod (EmitContext ec)
+#if !FULL_AOT_RUNTIME
+               void EmitArrayAccess (EmitContext ec)
                {
                        left.Emit (ec);
                        right.Emit (ec);
-                       ec.EmitCall (method);
+                       ec.ig.Emit (OpCodes.Ldelem, this.Type);
                }
 
-               static MethodInfo GetMethodNoPar (Type t, string name)
+               void EmitLogicalBinary (EmitContext ec)
                {
-                       var method = t.GetMethod (name, Type.EmptyTypes);
-                       if (method == null)
-                               throw new ArgumentException (
-                                       string.Format ("Internal error: method {0} with no parameters not found on {1}", name, t));
+                       switch (NodeType) {
+                       case ExpressionType.And:
+                       case ExpressionType.Or:
+                               if (!IsLifted)
+                                       EmitLogical (ec);
+                               else if (Type == typeof (bool?))
+                                       EmitLiftedLogical (ec);
+                               else
+                                       EmitLiftedArithmeticBinary (ec);
+                               break;
+                       case ExpressionType.AndAlso:
+                       case ExpressionType.OrElse:
+                               if (!IsLifted)
+                                       EmitLogicalShortCircuit (ec);
+                               else
+                                       EmitLiftedLogicalShortCircuit (ec);
+                               break;
+                       }
+               }
 
-                       return method;
+               void EmitLogical (EmitContext ec)
+               {
+                       EmitNonLiftedBinary (ec);
                }
 
-               void EmitArrayAccess (EmitContext ec)
+               void EmitLiftedLogical (EmitContext ec)
                {
-                       left.Emit (ec);
-                       right.Emit (ec);
-                       ec.ig.Emit (OpCodes.Ldelem, this.Type);
+                       var ig = ec.ig;
+                       var and = NodeType == ExpressionType.And;
+                       var left = ec.EmitStored (this.left);
+                       var right = ec.EmitStored (this.right);
+
+                       var ret_from_left = ig.DefineLabel ();
+                       var ret_from_right = ig.DefineLabel ();
+                       var done = ig.DefineLabel ();
+
+                       ec.EmitNullableGetValueOrDefault (left);
+                       ig.Emit (OpCodes.Brtrue, ret_from_left);
+                       ec.EmitNullableGetValueOrDefault (right);
+                       ig.Emit (OpCodes.Brtrue, ret_from_right);
+
+                       ec.EmitNullableHasValue (left);
+                       ig.Emit (OpCodes.Brfalse, ret_from_left);
+
+                       ig.MarkLabel (ret_from_right);
+                       ec.EmitLoad (and ? left : right);
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (ret_from_left);
+                       ec.EmitLoad (and ? right : left);
+
+                       ig.MarkLabel (done);
                }
 
-               void EmitLiftedLogical (EmitContext ec, bool and, bool short_circuit)
+               void EmitLogicalShortCircuit (EmitContext ec)
                {
                        var ig = ec.ig;
-                       LocalBuilder ret = ig.DeclareLocal (Type);
-                       LocalBuilder vleft = null, vright = null;
-                       MethodInfo has_value = left.Type.GetMethod ("get_HasValue");
-                       MethodInfo get_value = GetMethodNoPar (left.Type, "get_Value");
+                       var and = NodeType == ExpressionType.AndAlso;
+                       var ret = ig.DefineLabel ();
+                       var done = ig.DefineLabel ();
 
-                       vleft = ec.EmitStored (left);
-                       if (!short_circuit)
-                               vright = ec.EmitStored (right);
+                       ec.Emit (left);
+                       ig.Emit (and ? OpCodes.Brfalse : OpCodes.Brtrue, ret);
 
-                       Label left_is_null = ig.DefineLabel ();
-                       Label right_is_null = ig.DefineLabel ();
-                       Label create = ig.DefineLabel ();
-                       Label exit = ig.DefineLabel ();
-                       Label both_are_null = ig.DefineLabel ();
+                       ec.Emit (right);
 
-                       // Check left
+                       ig.Emit (OpCodes.Br, done);
 
-                       ig.Emit (OpCodes.Ldloca, vleft);
-                       ig.Emit (OpCodes.Call, has_value);
-                       ig.Emit (OpCodes.Brfalse, left_is_null);
+                       ig.MarkLabel (ret);
+                       ig.Emit (and ? OpCodes.Ldc_I4_0 : OpCodes.Ldc_I4_1);
+
+                       ig.MarkLabel (done);
+               }
+
+               MethodInfo GetFalseOperator ()
+               {
+                       return GetFalseOperator (left.Type.GetNotNullableType ());
+               }
+
+               MethodInfo GetTrueOperator ()
+               {
+                       return GetTrueOperator (left.Type.GetNotNullableType ());
+               }
+
+               void EmitUserDefinedLogicalShortCircuit (EmitContext ec)
+               {
+                       var ig = ec.ig;
+                       var and = NodeType == ExpressionType.AndAlso;
+
+                       var done = ig.DefineLabel ();
+
+                       var left = ec.EmitStored (this.left);
 
-                       ig.Emit (OpCodes.Ldloca, vleft);
-                       ig.Emit (OpCodes.Call, get_value);
+                       ec.EmitLoad (left);
                        ig.Emit (OpCodes.Dup);
+                       ec.EmitCall (and ? GetFalseOperator () : GetTrueOperator ());
+                       ig.Emit (OpCodes.Brtrue, done);
 
-                       ig.Emit (and ? OpCodes.Brfalse : OpCodes.Brtrue, create);
+                       ec.Emit (this.right);
+                       ec.EmitCall (method);
 
-                       // Deal with right
-                       if (short_circuit)
-                               vright = ec.EmitStored (right);
+                       ig.MarkLabel (done);
+               }
 
-                       ig.Emit (OpCodes.Ldloca, vright);
-                       ig.Emit (OpCodes.Call, has_value);
-                       ig.Emit (OpCodes.Brfalse, right_is_null);
+               void EmitLiftedLogicalShortCircuit (EmitContext ec)
+               {
+                       var ig = ec.ig;
+                       var and = NodeType == ExpressionType.AndAlso;
+                       var left_is_null = ig.DefineLabel ();
+                       var ret_from_left = ig.DefineLabel ();
+                       var ret_null = ig.DefineLabel ();
+                       var ret_new = ig.DefineLabel();
+                       var done = ig.DefineLabel();
+
+                       var left = ec.EmitStored (this.left);
+
+                       ec.EmitNullableHasValue (left);
+                       ig.Emit (OpCodes.Brfalse, left_is_null);
 
-                       ig.Emit (OpCodes.Ldloca, vright);
-                       ig.Emit (OpCodes.Call, get_value);
+                       ec.EmitNullableGetValueOrDefault (left);
 
-                       ig.Emit (and ? OpCodes.And : OpCodes.Or);
-                       ig.Emit (OpCodes.Br, create);
+                       ig.Emit (OpCodes.Ldc_I4_0);
+                       ig.Emit (OpCodes.Ceq);
+                       ig.Emit (and ? OpCodes.Brtrue : OpCodes.Brfalse, ret_from_left);
 
-                       // left_is_null:
                        ig.MarkLabel (left_is_null);
+                       var right = ec.EmitStored (this.right);
 
-                       ig.Emit (OpCodes.Ldloca, vright);
-                       ig.Emit (OpCodes.Call, has_value);
-                       ig.Emit (OpCodes.Brfalse, both_are_null);
-                       ig.Emit (OpCodes.Ldloca, vright);
-                       ig.Emit (OpCodes.Call, get_value);
-                       ig.Emit (OpCodes.Dup);
-                       ig.Emit (and ? OpCodes.Brfalse : OpCodes.Brtrue, create);
+                       ec.EmitNullableHasValue (right);
+                       ig.Emit (OpCodes.Brfalse_S, ret_null);
 
-                       // right_is_null:
-                       ig.MarkLabel (right_is_null);
-                       ig.Emit (OpCodes.Pop);
+                       ec.EmitNullableGetValueOrDefault (right);
+
+                       ig.Emit (OpCodes.Ldc_I4_0);
+                       ig.Emit (OpCodes.Ceq);
 
-                       // both_are_null:
-                       ig.MarkLabel (both_are_null);
-                       ig.Emit (OpCodes.Ldloca, ret);
-                       ig.Emit (OpCodes.Initobj, Type);
-                       ig.Emit (OpCodes.Ldloc, ret);
-                       ig.Emit (OpCodes.Br, exit);
+                       ig.Emit (and ? OpCodes.Brtrue : OpCodes.Brfalse, ret_from_left);
+
+                       ec.EmitNullableHasValue (left);
+                       ig.Emit (OpCodes.Brfalse, ret_null);
 
-                       // create:
-                       ig.MarkLabel (create);
-                       ig.Emit (OpCodes.Newobj, Type.GetConstructors () [0]);
+                       ig.Emit (and ? OpCodes.Ldc_I4_1 : OpCodes.Ldc_I4_0);
+                       ig.Emit (OpCodes.Br_S, ret_new);
 
-                       // exit:
-                       ig.MarkLabel (exit);
+                       ig.MarkLabel (ret_from_left);
+                       ig.Emit (and ? OpCodes.Ldc_I4_0 : OpCodes.Ldc_I4_1);
+
+                       ig.MarkLabel (ret_new);
+                       ec.EmitNullableNew (Type);
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (ret_null);
+                       var ret = ig.DeclareLocal (Type);
+                       ec.EmitNullableInitialize (ret);
+
+                       ig.MarkLabel (done);
                }
 
-               void EmitLogical (EmitContext ec, bool and, bool short_circuit)
+               void EmitCoalesce (EmitContext ec)
                {
-                       if (IsLifted) {
-                               EmitLiftedLogical (ec, and, short_circuit);
-                               return;
-                       }
+                       var ig = ec.ig;
+                       var done = ig.DefineLabel ();
+                       var load_right = ig.DefineLabel ();
 
-                       left.Emit (ec);
-                       right.Emit (ec);
-                       ec.ig.Emit (and ? OpCodes.And : OpCodes.Or);
+                       var left = ec.EmitStored (this.left);
+                       var left_is_nullable = left.LocalType.IsNullable ();
+
+                       if (left_is_nullable)
+                               ec.EmitNullableHasValue (left);
+                       else
+                               ec.EmitLoad (left);
+
+                       ig.Emit (OpCodes.Brfalse, load_right);
+
+                       if (left_is_nullable && !Type.IsNullable ())
+                               ec.EmitNullableGetValue (left);
+                       else
+                               ec.EmitLoad (left);
+
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (load_right);
+                       ec.Emit (this.right);
+
+                       ig.MarkLabel (done);
                }
 
-               void EmitCoalesce (EmitContext ec)
+               void EmitConvertedCoalesce (EmitContext ec)
                {
-                       ILGenerator ig = ec.ig;
+                       var ig = ec.ig;
+                       var done = ig.DefineLabel ();
+                       var load_right = ig.DefineLabel ();
 
-                       LocalBuilder vleft;
-                       LocalBuilder vright;
+                       var left = ec.EmitStored (this.left);
 
-                       MethodInfo has_value = left.Type.GetMethod ("get_HasValue");
+                       if (left.LocalType.IsNullable ())
+                               ec.EmitNullableHasValue (left);
+                       else
+                               ec.EmitLoad (left);
 
-                       Label exit = ig.DefineLabel ();
-                       Label try_right = ig.DefineLabel ();
-                       Label setup_null = ig.DefineLabel ();
+                       ig.Emit (OpCodes.Brfalse, load_right);
 
-                       vleft = ec.EmitStored (left);
-                       if (IsNullable (left.Type)){
-                               ig.Emit (OpCodes.Ldloca, vleft);
-                               ig.Emit (OpCodes.Call, has_value);
-                       } else
-                               ig.Emit (OpCodes.Ldloc, vleft);
+                       ec.Emit (conversion);
+                       ec.EmitLoad (left);
+                       ig.Emit (OpCodes.Callvirt, conversion.Type.GetInvokeMethod ());
 
-                       ig.Emit (OpCodes.Brfalse, try_right);
-                       ig.Emit (OpCodes.Ldloc, vleft);
-                       ig.Emit (OpCodes.Br, exit);
+                       ig.Emit (OpCodes.Br, done);
 
-               // try_right;
-                       ig.MarkLabel (try_right);
-                       vright = ec.EmitStored (right);
-                       if (IsNullable (right.Type)){
-                               ig.Emit (OpCodes.Ldloca, vright);
-                               ig.Emit (OpCodes.Call, has_value);
-                       } else
-                               ig.Emit (OpCodes.Ldloc, vright);
+                       ig.MarkLabel (load_right);
+                       ec.Emit (this.right);
 
-                       ig.Emit (OpCodes.Brfalse, setup_null);
-                       ig.Emit (OpCodes.Ldloc, vright);
-                       ig.Emit (OpCodes.Br, exit);
+                       ig.MarkLabel (done);
+               }
 
-               // setup_null:
-                       ig.MarkLabel (setup_null);
-                       LocalBuilder ret = ig.DeclareLocal (Type);
-                       ig.Emit (OpCodes.Ldloca, ret);
-                       ig.Emit (OpCodes.Initobj, Type);
-                       ig.Emit (OpCodes.Ldloc, ret);
+               static bool IsInt32OrInt64 (Type type)
+               {
+                       return type == typeof (int) || type == typeof (long);
+               }
 
-               // exit:
-                       ig.MarkLabel (exit);
+               static bool IsSingleOrDouble (Type type)
+               {
+                       return type == typeof (float) || type == typeof (double);
                }
 
                void EmitBinaryOperator (EmitContext ec)
                {
-                       OpCode opcode;
                        var ig = ec.ig;
                        bool is_unsigned = IsUnsigned (left.Type);
 
                        switch (NodeType) {
                        case ExpressionType.Add:
-                               opcode = OpCodes.Add;
+                               ig.Emit (OpCodes.Add);
                                break;
-
                        case ExpressionType.AddChecked:
-                               if (left.Type == typeof (int) || left.Type == typeof (long))
-                                       opcode = OpCodes.Add_Ovf;
-                               else if (is_unsigned)
-                                       opcode = OpCodes.Add_Ovf_Un;
+                               if (IsInt32OrInt64 (left.Type))
+                                       ig.Emit (OpCodes.Add_Ovf);
                                else
-                                       opcode = OpCodes.Add;
+                                       ig.Emit (is_unsigned ? OpCodes.Add_Ovf_Un : OpCodes.Add);
                                break;
-
                        case ExpressionType.Subtract:
-                               opcode = OpCodes.Sub;
+                               ig.Emit (OpCodes.Sub);
                                break;
-
                        case ExpressionType.SubtractChecked:
-                               if (left.Type == typeof (int) || left.Type == typeof (long))
-                                       opcode = OpCodes.Sub_Ovf;
-                               else if (is_unsigned)
-                                       opcode = OpCodes.Sub_Ovf_Un;
+                               if (IsInt32OrInt64 (left.Type))
+                                       ig.Emit (OpCodes.Sub_Ovf);
                                else
-                                       opcode = OpCodes.Sub;
+                                       ig.Emit (is_unsigned ? OpCodes.Sub_Ovf_Un : OpCodes.Sub);
                                break;
-
                        case ExpressionType.Multiply:
-                               opcode = OpCodes.Mul;
+                               ig.Emit (OpCodes.Mul);
                                break;
-
                        case ExpressionType.MultiplyChecked:
-                               if (left.Type == typeof (int) || left.Type == typeof (long))
-                                       opcode = OpCodes.Mul_Ovf;
-                               else if (is_unsigned)
-                                       opcode = OpCodes.Mul_Ovf_Un;
+                               if (IsInt32OrInt64 (left.Type))
+                                       ig.Emit (OpCodes.Mul_Ovf);
                                else
-                                       opcode = OpCodes.Mul;
+                                       ig.Emit (is_unsigned ? OpCodes.Mul_Ovf_Un : OpCodes.Mul);
                                break;
-
                        case ExpressionType.Divide:
-                               if (is_unsigned)
-                                       opcode = OpCodes.Div_Un;
-                               else
-                                       opcode = OpCodes.Div;
+                               ig.Emit (is_unsigned ? OpCodes.Div_Un : OpCodes.Div);
                                break;
-
                        case ExpressionType.Modulo:
-                               if (is_unsigned)
-                                       opcode = OpCodes.Rem_Un;
-                               else
-                                       opcode = OpCodes.Rem;
+                               ig.Emit (is_unsigned ? OpCodes.Rem_Un : OpCodes.Rem);
                                break;
-
                        case ExpressionType.RightShift:
-                               if (is_unsigned)
-                                       opcode = OpCodes.Shr_Un;
-                               else
-                                       opcode = OpCodes.Shr;
-                               break;
-
                        case ExpressionType.LeftShift:
-                               opcode = OpCodes.Shl;
+                               ig.Emit (OpCodes.Ldc_I4, left.Type == typeof (int) ? 0x1f : 0x3f);
+                               ig.Emit (OpCodes.And);
+                               if (NodeType == ExpressionType.RightShift)
+                                       ig.Emit (is_unsigned ? OpCodes.Shr_Un : OpCodes.Shr);
+                               else
+                                       ig.Emit (OpCodes.Shl);
                                break;
-
                        case ExpressionType.And:
-                               opcode = OpCodes.And;
+                               ig.Emit (OpCodes.And);
                                break;
-
                        case ExpressionType.Or:
-                               opcode = OpCodes.Or;
+                               ig.Emit (OpCodes.Or);
                                break;
-
                        case ExpressionType.ExclusiveOr:
-                               opcode = OpCodes.Xor;
+                               ig.Emit (OpCodes.Xor);
                                break;
-
                        case ExpressionType.GreaterThan:
-                               if (is_unsigned)
-                                       opcode = OpCodes.Cgt_Un;
-                               else
-                                       opcode = OpCodes.Cgt;
+                               ig.Emit (is_unsigned ? OpCodes.Cgt_Un : OpCodes.Cgt);
                                break;
-
                        case ExpressionType.GreaterThanOrEqual:
-                               Type le = left.Type;
-
-                               if (is_unsigned || (le == typeof (double) || le == typeof (float)))
+                               if (is_unsigned || IsSingleOrDouble (left.Type))
                                        ig.Emit (OpCodes.Clt_Un);
                                else
                                        ig.Emit (OpCodes.Clt);
 
                                ig.Emit (OpCodes.Ldc_I4_0);
-
-                               opcode = OpCodes.Ceq;
+                               ig.Emit (OpCodes.Ceq);
                                break;
-
                        case ExpressionType.LessThan:
-                               if (is_unsigned)
-                                       opcode = OpCodes.Clt_Un;
-                               else
-                                       opcode = OpCodes.Clt;
+                               ig.Emit (is_unsigned ? OpCodes.Clt_Un : OpCodes.Clt);
                                break;
-
                        case ExpressionType.LessThanOrEqual:
-                               Type lt = left.Type;
-
-                               if (is_unsigned || (lt == typeof (double) || lt == typeof (float)))
+                               if (is_unsigned || IsSingleOrDouble (left.Type))
                                        ig.Emit (OpCodes.Cgt_Un);
                                else
                                        ig.Emit (OpCodes.Cgt);
-                               ig.Emit (OpCodes.Ldc_I4_0);
 
-                               opcode = OpCodes.Ceq;
+                               ig.Emit (OpCodes.Ldc_I4_0);
+                               ig.Emit (OpCodes.Ceq);
                                break;
-
                        case ExpressionType.Equal:
-                               opcode = OpCodes.Ceq;
+                               ig.Emit (OpCodes.Ceq);
                                break;
-
                        case ExpressionType.NotEqual:
                                ig.Emit (OpCodes.Ceq);
                                ig.Emit (OpCodes.Ldc_I4_0);
-
-                               opcode = OpCodes.Ceq;
+                               ig.Emit (OpCodes.Ceq);
+                               break;
+                       case ExpressionType.Power:
+                               ig.Emit (OpCodes.Call, typeof (Math).GetMethod ("Pow"));
                                break;
-
                        default:
-                               throw new InvalidOperationException (string.Format ("Internal error: BinaryExpression contains non-Binary nodetype {0}", NodeType));
+                               throw new InvalidOperationException (
+                                       string.Format ("Internal error: BinaryExpression contains non-Binary nodetype {0}", NodeType));
                        }
+               }
 
-                       ig.Emit (opcode);
+               bool IsLeftLiftedBinary ()
+               {
+                       return left.Type.IsNullable () && !right.Type.IsNullable ();
+               }
+
+               void EmitLeftLiftedToNullBinary (EmitContext ec)
+               {
+                       var ig = ec.ig;
+
+                       var ret = ig.DefineLabel ();
+                       var done = ig.DefineLabel ();
+
+                       var left = ec.EmitStored (this.left);
+
+                       ec.EmitNullableHasValue (left);
+                       ig.Emit (OpCodes.Brfalse, ret);
+
+                       ec.EmitNullableGetValueOrDefault (left);
+                       ec.Emit (right);
+
+                       EmitBinaryOperator (ec);
+
+                       ec.EmitNullableNew (Type);
+
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (ret);
+
+                       var temp = ig.DeclareLocal (Type);
+                       ec.EmitNullableInitialize (temp);
+
+                       ig.MarkLabel (done);
                }
 
                void EmitLiftedArithmeticBinary (EmitContext ec)
+               {
+                       if (IsLeftLiftedBinary ())
+                               EmitLeftLiftedToNullBinary (ec);
+                       else
+                               EmitLiftedToNullBinary (ec);
+               }
+
+               void EmitLiftedToNullBinary (EmitContext ec)
                {
                        var ig = ec.ig;
                        var left = ec.EmitStored (this.left);
@@ -410,9 +486,7 @@ namespace System.Linq.Expressions {
                        ig.Emit (OpCodes.And);
                        ig.Emit (OpCodes.Brtrue, has_value);
 
-                       ig.Emit (OpCodes.Ldloca, result);
-                       ig.Emit (OpCodes.Initobj, result.LocalType);
-                       ig.Emit (OpCodes.Ldloc, result);
+                       ec.EmitNullableInitialize (result);
 
                        ig.Emit (OpCodes.Br, done);
 
@@ -479,66 +553,195 @@ namespace System.Linq.Expressions {
 
                void EmitArithmeticBinary (EmitContext ec)
                {
-                       if (!IsLifted) {
-                               left.Emit (ec);
-                               right.Emit (ec);
-                               EmitBinaryOperator (ec);
-                       } else
+                       if (!IsLifted)
+                               EmitNonLiftedBinary (ec);
+                       else
                                EmitLiftedArithmeticBinary (ec);
                }
 
+               void EmitNonLiftedBinary (EmitContext ec)
+               {
+                       ec.Emit (left);
+                       ec.Emit (right);
+                       EmitBinaryOperator (ec);
+               }
+
                void EmitRelationalBinary (EmitContext ec)
                {
-                       if (!IsLifted) {
-                               left.Emit (ec);
-                               right.Emit (ec);
-                               EmitBinaryOperator (ec);
-                       else
+                       if (!IsLifted)
+                               EmitNonLiftedBinary (ec);
+                       else if (IsLiftedToNull)
+                               EmitLiftedToNullBinary (ec);
+                       else
                                EmitLiftedRelationalBinary (ec);
                }
 
-               internal override void Emit (EmitContext ec)
+               void EmitLiftedUserDefinedOperator (EmitContext ec)
                {
-                       if (method != null){
-                               EmitMethod (ec);
-                               return;
+                       var ig = ec.ig;
+
+                       var ret_true = ig.DefineLabel ();
+                       var ret_false = ig.DefineLabel ();
+                       var done = ig.DefineLabel ();
+
+                       var left = ec.EmitStored (this.left);
+                       var right = ec.EmitStored (this.right);
+
+                       ec.EmitNullableHasValue (left);
+                       ec.EmitNullableHasValue (right);
+                       switch (NodeType) {
+                       case ExpressionType.Equal:
+                               ig.Emit (OpCodes.Bne_Un, ret_false);
+                               ec.EmitNullableHasValue (left);
+                               ig.Emit (OpCodes.Brfalse, ret_true);
+                               break;
+                       case ExpressionType.NotEqual:
+                               ig.Emit (OpCodes.Bne_Un, ret_true);
+                               ec.EmitNullableHasValue (left);
+                               ig.Emit (OpCodes.Brfalse, ret_false);
+                               break;
+                       default:
+                               ig.Emit (OpCodes.And);
+                               ig.Emit (OpCodes.Brfalse, ret_false);
+                               break;
                        }
 
-                       switch (NodeType){
-                       case ExpressionType.ArrayIndex:
-                               EmitArrayAccess (ec);
-                               return;
+                       ec.EmitNullableGetValueOrDefault (left);
+                       ec.EmitNullableGetValueOrDefault (right);
+                       ec.EmitCall (method);
+                       ig.Emit (OpCodes.Br, done);
 
-                       case ExpressionType.And:
-                               EmitLogical (ec, true, false);
-                               return;
+                       ig.MarkLabel (ret_true);
+                       ig.Emit (OpCodes.Ldc_I4_1);
+                       ig.Emit (OpCodes.Br, done);
 
-                       case ExpressionType.Or:
-                               EmitLogical (ec, false, false);
-                               return;
+                       ig.MarkLabel (ret_false);
+                       ig.Emit (OpCodes.Ldc_I4_0);
+                       ig.Emit (OpCodes.Br, done);
 
-                       case ExpressionType.AndAlso:
-                               EmitLogical (ec, true, true);
-                               return;
+                       ig.MarkLabel (done);
+               }
 
-                       case ExpressionType.OrElse:
-                               EmitLogical (ec, false, true);
+               void EmitLiftedToNullUserDefinedOperator (EmitContext ec)
+               {
+                       var ig = ec.ig;
+
+                       var ret = ig.DefineLabel ();
+                       var done = ig.DefineLabel ();
+
+                       var left = ec.EmitStored (this.left);
+                       var right = ec.EmitStored (this.right);
+
+                       ec.EmitNullableHasValue (left);
+                       ec.EmitNullableHasValue (right);
+                       ig.Emit (OpCodes.And);
+                       ig.Emit (OpCodes.Brfalse, ret);
+
+                       ec.EmitNullableGetValueOrDefault (left);
+                       ec.EmitNullableGetValueOrDefault (right);
+                       ec.EmitCall (method);
+                       ec.EmitNullableNew (Type);
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (ret);
+                       var temp = ig.DeclareLocal (Type);
+                       ec.EmitNullableInitialize (temp);
+
+                       ig.MarkLabel (done);
+               }
+
+               void EmitUserDefinedLiftedLogicalShortCircuit (EmitContext ec)
+               {
+                       var ig = ec.ig;
+                       var and = NodeType == ExpressionType.AndAlso;
+
+                       var left_is_null = ig.DefineLabel ();
+                       var ret_left = ig.DefineLabel ();
+                       var ret_null = ig.DefineLabel ();
+                       var done = ig.DefineLabel ();
+
+                       var left = ec.EmitStored (this.left);
+
+                       ec.EmitNullableHasValue (left);
+                       ig.Emit (OpCodes.Brfalse, and ? ret_null : left_is_null);
+
+                       ec.EmitNullableGetValueOrDefault (left);
+                       ec.EmitCall (and ? GetFalseOperator () : GetTrueOperator ());
+                       ig.Emit (OpCodes.Brtrue, ret_left);
+
+                       ig.MarkLabel (left_is_null);
+                       var right = ec.EmitStored (this.right);
+                       ec.EmitNullableHasValue (right);
+                       ig.Emit (OpCodes.Brfalse, ret_null);
+
+                       ec.EmitNullableGetValueOrDefault (left);
+                       ec.EmitNullableGetValueOrDefault (right);
+                       ec.EmitCall (method);
+
+                       ec.EmitNullableNew (Type);
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (ret_left);
+                       ec.EmitLoad (left);
+                       ig.Emit (OpCodes.Br, done);
+
+                       ig.MarkLabel (ret_null);
+                       var ret = ig.DeclareLocal (Type);
+                       ec.EmitNullableInitialize (ret);
+
+                       ig.MarkLabel (done);
+               }
+
+               void EmitUserDefinedOperator (EmitContext ec)
+               {
+                       if (!IsLifted) {
+                               switch (NodeType) {
+                               case ExpressionType.AndAlso:
+                               case ExpressionType.OrElse:
+                                       EmitUserDefinedLogicalShortCircuit (ec);
+                                       break;
+                               default:
+                                       left.Emit (ec);
+                                       right.Emit (ec);
+                                       ec.EmitCall (method);
+                                       break;
+                               }
+                       } else if (IsLiftedToNull) {
+                               switch (NodeType) {
+                               case ExpressionType.AndAlso:
+                               case ExpressionType.OrElse:
+                                       EmitUserDefinedLiftedLogicalShortCircuit (ec);
+                                       break;
+                               default:
+                                       EmitLiftedToNullUserDefinedOperator (ec);
+                                       break;
+                               }
+                       }  else
+                               EmitLiftedUserDefinedOperator (ec);
+               }
+
+               internal override void Emit (EmitContext ec)
+               {
+                       if (method != null) {
+                               EmitUserDefinedOperator (ec);
                                return;
+                       }
 
+                       switch (NodeType){
+                       case ExpressionType.ArrayIndex:
+                               EmitArrayAccess (ec);
+                               return;
                        case ExpressionType.Coalesce:
-                               EmitCoalesce (ec);
+                               if (conversion != null)
+                                       EmitConvertedCoalesce (ec);
+                               else
+                                       EmitCoalesce (ec);
                                return;
-
                        case ExpressionType.Power:
-                               // likely broken if lifted
-                               left.Emit (ec);
-                               right.Emit (ec);
-                               ec.EmitCall (typeof (Math).GetMethod ("Pow"));
-                               return;
-
                        case ExpressionType.Add:
                        case ExpressionType.AddChecked:
                        case ExpressionType.Divide:
+                       case ExpressionType.ExclusiveOr:
                        case ExpressionType.LeftShift:
                        case ExpressionType.Modulo:
                        case ExpressionType.Multiply:
@@ -556,9 +759,16 @@ namespace System.Linq.Expressions {
                        case ExpressionType.NotEqual:
                                EmitRelationalBinary (ec);
                                return;
+                       case ExpressionType.And:
+                       case ExpressionType.Or:
+                       case ExpressionType.AndAlso:
+                       case ExpressionType.OrElse:
+                               EmitLogicalBinary (ec);
+                               return;
                        default:
                                throw new NotSupportedException (this.NodeType.ToString ());
                        }
                }
+#endif
        }
 }