[Mono.Debugger.Soft] Implement IsGenericType/Method for protocol < 2.12
[mono.git] / mcs / mcs / nullable.cs
index b834121dc96d1774ae1efea96a6ca6d5d9562509..75048365c4ed5d25514508dafba7bcdd1fafac50 100644 (file)
@@ -9,40 +9,42 @@
 //
 // Copyright 2001, 2002, 2003 Ximian, Inc (http://www.ximian.com)
 // Copyright 2004-2008 Novell, Inc
+// Copyright 2011 Xamarin Inc
 //
 
 using System;
-using System.Reflection;
+
+#if STATIC
+using IKVM.Reflection.Emit;
+#else
 using System.Reflection.Emit;
+#endif
        
 namespace Mono.CSharp.Nullable
 {
        public class NullableType : TypeExpr
        {
-               TypeExpr underlying;
+               readonly TypeSpec underlying;
 
-               public NullableType (TypeExpr underlying, Location l)
+               public NullableType (TypeSpec type, Location loc)
                {
-                       this.underlying = underlying;
-                       loc = l;
-
-                       eclass = ExprClass.Type;
+                       this.underlying = type;
+                       this.loc = loc;
                }
 
-               public NullableType (TypeSpec type, Location loc)
-                       : this (new TypeExpression (type, loc), loc)
-               { }
-
-               protected override TypeExpr DoResolveAsTypeStep (IMemberContext ec)
+               public override TypeSpec ResolveAsType (IMemberContext ec)
                {
-                       if (TypeManager.generic_nullable_type == null) {
-                               TypeManager.generic_nullable_type = TypeManager.CoreLookupType (ec.Compiler,
-                                       "System", "Nullable", 1, MemberKind.Struct, true);
-                       }
+                       eclass = ExprClass.Type;
 
-                       TypeArguments args = new TypeArguments (underlying);
-                       GenericTypeExpr ctype = new GenericTypeExpr (TypeManager.generic_nullable_type, args, loc);
-                       return ctype.ResolveAsTypeTerminal (ec, false);
+                       var otype = ec.Module.PredefinedTypes.Nullable.Resolve ();
+                       if (otype == null)
+                               return null;
+
+                       TypeArguments args = new TypeArguments (new TypeExpression (underlying, loc));
+                       GenericTypeExpr ctype = new GenericTypeExpr (otype, args, loc);
+                       
+                       type = ctype.ResolveAsType (ec);
+                       return type;
                }
        }
 
@@ -50,7 +52,8 @@ namespace Mono.CSharp.Nullable
        {
                public static MethodSpec GetConstructor (TypeSpec nullableType)
                {
-                       return TypeManager.GetPredefinedConstructor (nullableType, Location.Null, GetUnderlyingType (nullableType));
+                       return (MethodSpec) MemberCache.FindMember (nullableType,
+                               MemberFilter.Constructor (ParametersCompiled.CreateFullyResolved (GetUnderlyingType (nullableType))), BindingRestriction.DeclaredOnly);
                }
 
                public static MethodSpec GetHasValue (TypeSpec nullableType)
@@ -75,14 +78,9 @@ namespace Mono.CSharp.Nullable
                {
                        return ((InflatedTypeSpec) nullableType).TypeArguments[0];
                }
-
-               public static bool IsNullableType (TypeSpec type)
-               {
-                       throw new NotImplementedException ("net");
-               }
        }
 
-       public class Unwrap : Expression, IMemoryLocation, IAssignMethod
+       public class Unwrap : Expression, IMemoryLocation
        {
                Expression expr;
 
@@ -99,6 +97,11 @@ namespace Mono.CSharp.Nullable
                        eclass = expr.eclass;
                }
 
+               public override bool ContainsEmitWithAwait ()
+               {
+                       return expr.ContainsEmitWithAwait ();
+               }
+
                public static Expression Create (Expression expr)
                {
                        //
@@ -135,16 +138,24 @@ namespace Mono.CSharp.Nullable
                public override void Emit (EmitContext ec)
                {
                        Store (ec);
+
+                       var call = new CallEmitter ();
+                       call.InstanceExpression = this;
+
                        if (useDefaultValue)
-                               Invocation.EmitCall (ec, this, NullableInfo.GetGetValueOrDefault (expr.Type), null, loc);
+                               call.EmitPredefined (ec, NullableInfo.GetGetValueOrDefault (expr.Type), null);
                        else
-                               Invocation.EmitCall (ec, this, NullableInfo.GetValue (expr.Type), null, loc);
+                               call.EmitPredefined (ec, NullableInfo.GetValue (expr.Type), null);
                }
 
                public void EmitCheck (EmitContext ec)
                {
                        Store (ec);
-                       Invocation.EmitCall (ec, this, NullableInfo.GetHasValue (expr.Type), null, loc);
+
+                       var call = new CallEmitter ();
+                       call.InstanceExpression = this;
+
+                       call.EmitPredefined (ec, NullableInfo.GetHasValue (expr.Type), null);
                }
 
                public override bool Equals (object obj)
@@ -172,10 +183,10 @@ namespace Mono.CSharp.Nullable
 
                void Store (EmitContext ec)
                {
-                       if (expr is VariableReference)
+                       if (temp != null)
                                return;
 
-                       if (temp != null)
+                       if (expr is VariableReference)
                                return;
 
                        expr.Emit (ec);
@@ -214,51 +225,6 @@ namespace Mono.CSharp.Nullable
                                return temp;
                        }
                }
-
-               public void Emit (EmitContext ec, bool leave_copy)
-               {
-                       if (leave_copy)
-                               Load (ec);
-
-                       Emit (ec);
-               }
-
-               public void EmitAssign (EmitContext ec, Expression source,
-                                       bool leave_copy, bool prepare_for_load)
-               {
-                       InternalWrap wrap = new InternalWrap (source, expr.Type, loc);
-                       ((IAssignMethod) expr).EmitAssign (ec, wrap, leave_copy, false);
-               }
-
-               class InternalWrap : Expression
-               {
-                       public Expression expr;
-
-                       public InternalWrap (Expression expr, TypeSpec type, Location loc)
-                       {
-                               this.expr = expr;
-                               this.loc = loc;
-                               this.type = type;
-
-                               eclass = ExprClass.Value;
-                       }
-
-                       public override Expression CreateExpressionTree (ResolveContext ec)
-                       {
-                               throw new NotSupportedException ("ET");
-                       }
-
-                       protected override Expression DoResolve (ResolveContext ec)
-                       {
-                               return this;
-                       }
-
-                       public override void Emit (EmitContext ec)
-                       {
-                               expr.Emit (ec);
-                               ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
-                       }
-               }
        }
 
        //
@@ -283,7 +249,9 @@ namespace Mono.CSharp.Nullable
 
                public override void Emit (EmitContext ec)
                {
-                       Invocation.EmitCall (ec, Child, NullableInfo.GetValue (Child.Type), null, loc);
+                       var call = new CallEmitter ();
+                       call.InstanceExpression = Child;
+                       call.EmitPredefined (ec, NullableInfo.GetValue (Child.Type), null);
                }
        }
 
@@ -341,7 +309,7 @@ namespace Mono.CSharp.Nullable
                        return new LiftedNull (nullable, loc);
                }
 
-               public static Expression CreateFromExpression (ResolveContext ec, Expression e)
+               public static Constant CreateFromExpression (ResolveContext ec, Expression e)
                {
                        ec.Report.Warning (458, 2, e.Location, "The result of the expression is always `null' of type `{0}'",
                                TypeManager.CSharpName (e.Type));
@@ -357,6 +325,7 @@ namespace Mono.CSharp.Nullable
                        value_target.AddressOf (ec, AddressOp.Store);
                        ec.Emit (OpCodes.Initobj, type);
                        value_target.Emit (ec);
+                       value_target.Release (ec);
                }
 
                public void AddressOf (EmitContext ec, AddressOp Mode)
@@ -389,6 +358,11 @@ namespace Mono.CSharp.Nullable
                        : this (expr, unwrap as Unwrap, type)
                {
                }
+
+               public override bool ContainsEmitWithAwait ()
+               {
+                       return unwrap.ContainsEmitWithAwait ();
+               }
                
                public override Expression CreateExpressionTree (ResolveContext ec)
                {
@@ -402,7 +376,7 @@ namespace Mono.CSharp.Nullable
                        //
                        if (unwrap == null) {
                                // S -> T? is wrap only
-                               if (TypeManager.IsNullableType (type))
+                               if (type.IsNullableType)
                                        return Wrap.Create (expr, type);
 
                                // S -> T can be simplified
@@ -410,13 +384,13 @@ namespace Mono.CSharp.Nullable
                        }
 
                        // Wrap target for T?
-                       if (TypeManager.IsNullableType (type)) {
+                       if (type.IsNullableType) {
                                expr = Wrap.Create (expr, type);
                                if (expr == null)
                                        return null;
 
                                null_value = LiftedNull.Create (type, loc);
-                       } else if (TypeManager.IsValueType (type)) {
+                       } else if (TypeSpec.IsValueType (type)) {
                                null_value = LiftedNull.Create (type, loc);
                        } else {
                                null_value = new NullConstant (type, loc);
@@ -522,18 +496,17 @@ namespace Mono.CSharp.Nullable
 
                Expression LiftExpression (ResolveContext ec, Expression expr)
                {
-                       TypeExpr lifted_type = new NullableType (expr.Type, expr.Location);
-                       lifted_type = lifted_type.ResolveAsTypeTerminal (ec, false);
-                       if (lifted_type == null)
+                       var lifted_type = new NullableType (expr.Type, expr.Location);
+                       if (lifted_type.ResolveAsType (ec) == null)
                                return null;
 
                        expr.Type = lifted_type.Type;
                        return expr;
                }
 
-               protected override Expression ResolveEnumOperator (ResolveContext ec, Expression expr)
+               protected override Expression ResolveEnumOperator (ResolveContext ec, Expression expr, TypeSpec[] predefined)
                {
-                       expr = base.ResolveEnumOperator (ec, expr);
+                       expr = base.ResolveEnumOperator (ec, expr, predefined);
                        if (expr == null)
                                return null;
 
@@ -562,7 +535,6 @@ namespace Mono.CSharp.Nullable
        public class LiftedBinaryOperator : Binary
        {
                Unwrap left_unwrap, right_unwrap;
-               bool left_null_lifted, right_null_lifted;
                Expression left_orig, right_orig;
                Expression user_operator;
                MethodSpec wrap_ctor;
@@ -572,6 +544,26 @@ namespace Mono.CSharp.Nullable
                {
                }
 
+               bool IsBitwiseBoolean {
+                       get {
+                               return (Oper == Operator.BitwiseAnd || Oper == Operator.BitwiseOr) &&
+                               ((left_unwrap != null && left_unwrap.Type.BuiltinType == BuiltinTypeSpec.Type.Bool) ||
+                                (right_unwrap != null && right_unwrap.Type.BuiltinType == BuiltinTypeSpec.Type.Bool));
+                       }
+               }
+
+               bool IsLeftNullLifted {
+                       get {
+                               return (state & State.LeftNullLifted) != 0;
+                       }
+               }
+
+               bool IsRightNullLifted {
+                       get {
+                               return (state & State.RightNullLifted) != 0;
+                       }
+               }
+
                public override Expression CreateExpressionTree (ResolveContext ec)
                {
                        if (user_operator != null)
@@ -585,17 +577,17 @@ namespace Mono.CSharp.Nullable
                // with the null literal *outside* of a generics context and
                // inlines that as true or false.
                //
-               Expression CreateNullConstant (ResolveContext ec, Expression expr)
+               Constant CreateNullConstant (ResolveContext ec, Expression expr)
                {
                        // FIXME: Handle side effect constants
-                       Constant c = new BoolConstant (Oper == Operator.Inequality, loc).Resolve (ec);
+                       Constant c = new BoolConstant (ec.BuiltinTypes, Oper == Operator.Inequality, loc);
 
                        if ((Oper & Operator.EqualityMask) != 0) {
                                ec.Report.Warning (472, 2, loc, "The result of comparing value type `{0}' with null is `{1}'",
-                                       TypeManager.CSharpName (expr.Type), c.AsString ());
+                                       TypeManager.CSharpName (expr.Type), c.GetValueAsLiteral ());
                        } else {
                                ec.Report.Warning (464, 2, loc, "The result of comparing type `{0}' with null is always `{1}'",
-                                       TypeManager.CSharpName (expr.Type), c.AsString ());
+                                       TypeManager.CSharpName (expr.Type), c.GetValueAsLiteral ());
                        }
 
                        return ReducedExpression.Create (c, this);
@@ -610,14 +602,14 @@ namespace Mono.CSharp.Nullable
 
                        bool use_default_call = (Oper & (Operator.BitwiseMask | Operator.EqualityMask)) != 0;
                        left_orig = left;
-                       if (TypeManager.IsNullableType (left.Type)) {
+                       if (left.Type.IsNullableType) {
                                left = left_unwrap = Unwrap.Create (left, use_default_call);
                                if (left == null)
                                        return null;
                        }
 
                        right_orig = right;
-                       if (TypeManager.IsNullableType (right.Type)) {
+                       if (right.Type.IsNullableType) {
                                right = right_unwrap = Unwrap.Create (right, use_default_call);
                                if (right == null)
                                        return null;
@@ -628,16 +620,20 @@ namespace Mono.CSharp.Nullable
                        // Arguments can be lifted for equal operators when the return type is bool and both
                        // arguments are of same type
                        //      
-                       if (left_orig.IsNull) {
+                       if (left_orig is NullLiteral) {
                                left = right;
-                               left_null_lifted = true;
-                               type = TypeManager.bool_type;
+                               state |= State.LeftNullLifted;
+                               type = ec.BuiltinTypes.Bool;
                        }
 
                        if (right_orig.IsNull) {
-                               right = left;
-                               right_null_lifted = true;
-                               type = TypeManager.bool_type;
+                               if ((Oper & Operator.ShiftMask) != 0)
+                                       right = new EmptyExpression (ec.BuiltinTypes.Int);
+                               else
+                                       right = left;
+
+                               state |= State.RightNullLifted;
+                               type = ec.BuiltinTypes.Bool;
                        }
 
                        eclass = ExprClass.Value;
@@ -650,11 +646,21 @@ namespace Mono.CSharp.Nullable
                        Label load_right = ec.DefineLabel ();
                        Label end_label = ec.DefineLabel ();
 
+                       // null & value, null | value
+                       if (left_unwrap == null) {
+                               left_unwrap = right_unwrap;
+                               right_unwrap = null;
+                               right = left;
+                       }
+
                        left_unwrap.Emit (ec);
-                       ec.Emit (OpCodes.Brtrue_S, load_right);
+                       ec.Emit (OpCodes.Brtrue, load_right);
 
-                       right_unwrap.Emit (ec);
-                       ec.Emit (OpCodes.Brtrue_S, load_left);
+                       // value & null, value | null
+                       if (right_unwrap != null) {
+                               right_unwrap.Emit (ec);
+                               ec.Emit (OpCodes.Brtrue_S, load_left);
+                       }
 
                        left_unwrap.EmitCheck (ec);
                        ec.Emit (OpCodes.Brfalse_S, load_right);
@@ -665,14 +671,30 @@ namespace Mono.CSharp.Nullable
                        if (Oper == Operator.BitwiseAnd) {
                                left_unwrap.Load (ec);
                        } else {
-                               right_unwrap.Load (ec);
-                               right_unwrap = left_unwrap;
+                               if (right_unwrap == null) {
+                                       right.Emit (ec);
+                                       if (right is EmptyConstantCast || right is EmptyCast)
+                                               ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
+                               } else {
+                                       right_unwrap.Load (ec);
+                                       right_unwrap = left_unwrap;
+                               }
                        }
                        ec.Emit (OpCodes.Br_S, end_label);
 
                        // load right
                        ec.MarkLabel (load_right);
-                       right_unwrap.Load (ec);
+                       if (right_unwrap == null) {
+                               if (Oper == Operator.BitwiseAnd) {
+                                       right.Emit (ec);
+                                       if (right is EmptyConstantCast || right is EmptyCast)
+                                               ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
+                               } else {
+                                       left_unwrap.Load (ec);
+                               }
+                       } else {
+                               right_unwrap.Load (ec);
+                       }
 
                        ec.MarkLabel (end_label);
                }
@@ -685,19 +707,19 @@ namespace Mono.CSharp.Nullable
                        //
                        // Either left or right is null
                        //
-                       if (left_unwrap != null && (right_null_lifted || right.IsNull)) {
+                       if (left_unwrap != null && (IsRightNullLifted || right.IsNull)) {
                                left_unwrap.EmitCheck (ec);
                                if (Oper == Binary.Operator.Equality) {
-                                       ec.Emit (OpCodes.Ldc_I4_0);
+                                       ec.EmitInt (0);
                                        ec.Emit (OpCodes.Ceq);
                                }
                                return;
                        }
 
-                       if (right_unwrap != null && (left_null_lifted || left.IsNull)) {
+                       if (right_unwrap != null && (IsLeftNullLifted || left.IsNull)) {
                                right_unwrap.EmitCheck (ec);
                                if (Oper == Binary.Operator.Equality) {
-                                       ec.Emit (OpCodes.Ldc_I4_0);
+                                       ec.EmitInt (0);
                                        ec.Emit (OpCodes.Ceq);
                                }
                                return;
@@ -710,6 +732,11 @@ namespace Mono.CSharp.Nullable
                                user_operator.Emit (ec);
                                ec.Emit (Oper == Operator.Equality ? OpCodes.Brfalse_S : OpCodes.Brtrue_S, dissimilar_label);
                        } else {
+                               if (ec.HasSet (BuilderContext.Options.AsyncBody) && right.ContainsEmitWithAwait ()) {
+                                       left = left.EmitToField (ec);
+                                       right = right.EmitToField (ec);
+                               }
+
                                left.Emit (ec);
                                right.Emit (ec);
 
@@ -729,7 +756,7 @@ namespace Mono.CSharp.Nullable
                                        ec.Emit (OpCodes.Ceq);
                        } else {
                                if (Oper == Operator.Inequality) {
-                                       ec.Emit (OpCodes.Ldc_I4_0);
+                                       ec.EmitInt (0);
                                        ec.Emit (OpCodes.Ceq);
                                }
                        }
@@ -738,9 +765,9 @@ namespace Mono.CSharp.Nullable
 
                        ec.MarkLabel (dissimilar_label);
                        if (Oper == Operator.Inequality)
-                               ec.Emit (OpCodes.Ldc_I4_1);
+                               ec.EmitInt (1);
                        else
-                               ec.Emit (OpCodes.Ldc_I4_0);
+                               ec.EmitInt (0);
 
                        ec.MarkLabel (end_label);
                }
@@ -794,7 +821,7 @@ namespace Mono.CSharp.Nullable
                        ec.MarkLabel (is_null_label);
 
                        if ((Oper & Operator.ComparisonMask) != 0) {
-                               ec.Emit (OpCodes.Ldc_I4_0);
+                               ec.EmitInt (0);
                        } else {
                                LiftedNull.Create (type, loc).Emit (ec);
                        }
@@ -809,63 +836,70 @@ namespace Mono.CSharp.Nullable
                                return;
                        }
 
-                       if (TypeManager.IsNullableType (l))
-                               l = TypeManager.GetTypeArguments (l) [0];
-
-                       base.EmitOperator (ec, l);
-               }
+                       if (left.Type.IsNullableType) {
+                               l = NullableInfo.GetUnderlyingType (left.Type);
+                               left = EmptyCast.Create (left, l);
+                       }
 
-               bool IsBitwiseBoolean {
-                       get {
-                               return (Oper & Operator.BitwiseMask) != 0 && left_unwrap != null && right_unwrap != null &&
-                               left_unwrap.Type == TypeManager.bool_type && right_unwrap.Type == TypeManager.bool_type;
+                       if (right.Type.IsNullableType) {
+                               right = EmptyCast.Create (right, NullableInfo.GetUnderlyingType (right.Type));
                        }
+
+                       base.EmitOperator (ec, l);
                }
 
                Expression LiftResult (ResolveContext ec, Expression res_expr)
                {
-                       TypeExpr lifted_type;
+                       TypeSpec lifted_type;
 
                        //
                        // Avoid double conversion
                        //
-                       if (left_unwrap == null || left_null_lifted || left_unwrap.Type != left.Type || (left_unwrap != null && right_null_lifted)) {
-                               lifted_type = new NullableType (left.Type, loc);
-                               lifted_type = lifted_type.ResolveAsTypeTerminal (ec, false);
+                       if (left_unwrap == null || IsLeftNullLifted || left_unwrap.Type != left.Type || (left_unwrap != null && IsRightNullLifted)) {
+                               lifted_type = new NullableType (left.Type, loc).ResolveAsType (ec);
                                if (lifted_type == null)
                                        return null;
 
                                if (left is UserCast || left is TypeCast)
-                                       left.Type = lifted_type.Type;
+                                       left.Type = lifted_type;
                                else
-                                       left = EmptyCast.Create (left, lifted_type.Type);
+                                       left = EmptyCast.Create (left, lifted_type);
                        }
 
-                       if (left != right && (right_unwrap == null || right_null_lifted || right_unwrap.Type != right.Type || (right_unwrap != null && left_null_lifted))) {
-                               lifted_type = new NullableType (right.Type, loc);
-                               lifted_type = lifted_type.ResolveAsTypeTerminal (ec, false);
+                       if (left != right && (right_unwrap == null || IsRightNullLifted || right_unwrap.Type != right.Type || (right_unwrap != null && IsLeftNullLifted))) {
+                               lifted_type = new NullableType (right.Type, loc).ResolveAsType (ec);
                                if (lifted_type == null)
                                        return null;
 
-                               if (right is UserCast || right is TypeCast)
-                                       right.Type = lifted_type.Type;
+                               var r = right;
+                               if (r is ReducedExpression)
+                                       r = ((ReducedExpression) r).OriginalExpression;
+
+                               if (r is UserCast || r is TypeCast)
+                                       r.Type = lifted_type;
                                else
-                                       right = EmptyCast.Create (right, lifted_type.Type);
+                                       right = EmptyCast.Create (right, lifted_type);
                        }
 
                        if ((Oper & Operator.ComparisonMask) == 0) {
-                               lifted_type = new NullableType (res_expr.Type, loc);
-                               lifted_type = lifted_type.ResolveAsTypeTerminal (ec, false);
+                               lifted_type = new NullableType (res_expr.Type, loc).ResolveAsType (ec);
                                if (lifted_type == null)
                                        return null;
 
-                               wrap_ctor = NullableInfo.GetConstructor (lifted_type.Type);
-                               type = res_expr.Type = lifted_type.Type;
+                               wrap_ctor = NullableInfo.GetConstructor (lifted_type);
+                               type = res_expr.Type = lifted_type;
                        }
 
-                       if (left_null_lifted) {
+                       if (IsLeftNullLifted) {
                                left = LiftedNull.Create (right.Type, left.Location);
 
+                               //
+                               // Special case for bool?, the result depends on both null right side and left side value
+                               //
+                               if ((Oper == Operator.BitwiseAnd || Oper == Operator.BitwiseOr) && NullableInfo.GetUnderlyingType (type).BuiltinType == BuiltinTypeSpec.Type.Bool) {
+                                       return res_expr;
+                               }
+
                                if ((Oper & (Operator.ArithmeticMask | Operator.ShiftMask | Operator.BitwiseMask)) != 0)
                                        return LiftedNull.CreateFromExpression (ec, res_expr);
 
@@ -873,12 +907,19 @@ namespace Mono.CSharp.Nullable
                                // Value types and null comparison
                                //
                                if (right_unwrap == null || (Oper & Operator.RelationalMask) != 0)
-                                       return CreateNullConstant (ec, right_orig).Resolve (ec);
+                                       return CreateNullConstant (ec, right_orig);
                        }
 
-                       if (right_null_lifted) {
+                       if (IsRightNullLifted) {
                                right = LiftedNull.Create (left.Type, right.Location);
 
+                               //
+                               // Special case for bool?, the result depends on both null right side and left side value
+                               //
+                               if ((Oper == Operator.BitwiseAnd || Oper == Operator.BitwiseOr) && NullableInfo.GetUnderlyingType (type).BuiltinType == BuiltinTypeSpec.Type.Bool) {
+                                       return res_expr;
+                               }
+
                                if ((Oper & (Operator.ArithmeticMask | Operator.ShiftMask | Operator.BitwiseMask)) != 0)
                                        return LiftedNull.CreateFromExpression (ec, res_expr);
 
@@ -907,19 +948,44 @@ namespace Mono.CSharp.Nullable
                        // (in unlifted or lifted form) exists for the operation.
                        //
                        if (e == null && (Oper & Operator.EqualityMask) != 0) {
-                               if ((left_null_lifted && right_unwrap != null) || (right_null_lifted && left_unwrap != null))
+                               if ((IsLeftNullLifted && right_unwrap != null) || (IsRightNullLifted && left_unwrap != null))
                                        return LiftResult (ec, this);
                        }
 
                        return e;
                }
 
-               protected override Expression ResolveUserOperator (ResolveContext ec, TypeSpec l, TypeSpec r)
+               protected override Expression ResolveUserOperator (ResolveContext ec, Expression left, Expression right)
                {
-                       Expression expr = base.ResolveUserOperator (ec, l, r);
+                       //
+                       // Try original types first for exact match without unwrapping
+                       //
+                       Expression expr = base.ResolveUserOperator (ec, left_orig, right_orig);
+                       if (expr != null)
+                               return expr;
+
+                       State orig_state = state;
+
+                       //
+                       // One side is a nullable type, try to match underlying types
+                       //
+                       if (left_unwrap != null || right_unwrap != null || (state & (State.RightNullLifted | State.LeftNullLifted)) != 0) {
+                               expr = base.ResolveUserOperator (ec, left, right);
+                       }
+
                        if (expr == null)
                                return null;
 
+                       //
+                       // Lift the result in the case it can be null and predefined or user operator
+                       // result type is of a value type
+                       //
+                       if (!TypeSpec.IsValueType (expr.Type))
+                               return null;
+
+                       if (state != orig_state)
+                               return expr;
+
                        expr = LiftResult (ec, expr);
                        if (expr is Constant)
                                return expr;
@@ -941,6 +1007,18 @@ namespace Mono.CSharp.Nullable
                        this.right = right;
                        this.loc = loc;
                }
+
+               public Expression LeftExpression {
+                       get {
+                               return left;
+                       }
+               }
+
+               public Expression RightExpression {
+                       get {
+                               return right;
+                       }
+               }
                
                public override Expression CreateExpressionTree (ResolveContext ec)
                {
@@ -979,25 +1057,52 @@ namespace Mono.CSharp.Nullable
                        // If left is a nullable type and an implicit conversion exists from right to underlying type of left,
                        // the result is underlying type of left
                        //
-                       if (TypeManager.IsNullableType (ltype)) {
+                       if (ltype.IsNullableType) {
                                unwrap = Unwrap.Create (left, false);
                                if (unwrap == null)
                                        return null;
 
+                               //
+                               // Reduce (left ?? null) to left
+                               //
+                               if (right.IsNull)
+                                       return ReducedExpression.Create (left, this);
+
                                if (Convert.ImplicitConversionExists (ec, right, unwrap.Type)) {
                                        left = unwrap;
-                                       type = left.Type;
-                                       right = Convert.ImplicitConversion (ec, right, type, loc);
+                                       ltype = left.Type;
+
+                                       //
+                                       // If right is a dynamic expression, the result type is dynamic
+                                       //
+                                       if (right.Type.BuiltinType == BuiltinTypeSpec.Type.Dynamic) {
+                                               type = right.Type;
+
+                                               // Need to box underlying value type
+                                               left = Convert.ImplicitBoxingConversion (left, ltype, type);
+                                               return this;
+                                       }
+
+                                       right = Convert.ImplicitConversion (ec, right, ltype, loc);
+                                       type = ltype;
                                        return this;
                                }
-                       } else if (TypeManager.IsReferenceType (ltype)) {
+                       } else if (TypeSpec.IsReferenceType (ltype)) {
                                if (Convert.ImplicitConversionExists (ec, right, ltype)) {
                                        //
-                                       // Reduce (constant ?? expr) to constant
+                                       // If right is a dynamic expression, the result type is dynamic
+                                       //
+                                       if (right.Type.BuiltinType == BuiltinTypeSpec.Type.Dynamic) {
+                                               type = right.Type;
+                                               return this;
+                                       }
+
+                                       //
+                                       // Reduce ("foo" ?? expr) to expression
                                        //
                                        Constant lc = left as Constant;
                                        if (lc != null && !lc.IsDefaultValue)
-                                               return new SideEffectConstant (lc, right, loc).Resolve (ec);
+                                               return ReducedExpression.Create (lc, this);
 
                                        //
                                        // Reduce (left ?? null) to left OR (null-constant ?? right) to right
@@ -1006,7 +1111,15 @@ namespace Mono.CSharp.Nullable
                                                return ReducedExpression.Create (lc != null ? right : left, this);
 
                                        right = Convert.ImplicitConversion (ec, right, ltype, loc);
-                                       type = left.Type;
+                                       type = ltype;
+                                       return this;
+                               }
+
+                               //
+                               // Special case null ?? null
+                               //
+                               if (ltype == right.Type) {
+                                       type = ltype;
                                        return this;
                                }
                        } else {
@@ -1021,13 +1134,21 @@ namespace Mono.CSharp.Nullable
                        // Reduce (null ?? right) to right
                        //
                        if (left.IsNull)
-                               return ReducedExpression.Create (right, this);
+                               return ReducedExpression.Create (right, this).Resolve (ec);
 
                        left = Convert.ImplicitConversion (ec, unwrap != null ? unwrap : left, rtype, loc);
                        type = rtype;
                        return this;
                }
 
+               public override bool ContainsEmitWithAwait ()
+               {
+                       if (unwrap != null)
+                               return unwrap.ContainsEmitWithAwait () || right.ContainsEmitWithAwait ();
+
+                       return left.ContainsEmitWithAwait () || right.ContainsEmitWithAwait ();
+               }
+
                protected override Expression DoResolve (ResolveContext ec)
                {
                        left = left.Resolve (ec);
@@ -1089,77 +1210,65 @@ namespace Mono.CSharp.Nullable
                        target.left = left.Clone (clonectx);
                        target.right = right.Clone (clonectx);
                }
-       }
-
-       public class LiftedUnaryMutator : ExpressionStatement
-       {
-               public readonly UnaryMutator.Mode Mode;
-               Expression expr;
-               UnaryMutator underlying;
-               Unwrap unwrap;
-
-               public LiftedUnaryMutator (UnaryMutator.Mode mode, Expression expr, Location loc)
+               
+               public override object Accept (StructuralVisitor visitor)
                {
-                       this.expr = expr;
-                       this.Mode = mode;
-                       this.loc = loc;
+                       return visitor.Visit (this);
                }
+       }
 
-               public override Expression CreateExpressionTree (ResolveContext ec)
+       class LiftedUnaryMutator : UnaryMutator
+       {
+               public LiftedUnaryMutator (Mode mode, Expression expr, Location loc)
+                       : base (mode, expr, loc)
                {
-                       return new SimpleAssign (this, this).CreateExpressionTree (ec);
                }
 
                protected override Expression DoResolve (ResolveContext ec)
                {
-                       expr = expr.Resolve (ec);
-                       if (expr == null)
-                               return null;
+                       var orig_expr = expr;
 
-                       unwrap = Unwrap.Create (expr, false);
-                       if (unwrap == null)
-                               return null;
+                       expr = Unwrap.Create (expr);
 
-                       underlying = (UnaryMutator) new UnaryMutator (Mode, unwrap, loc).Resolve (ec);
-                       if (underlying == null)
-                               return null;
+                       var res = base.DoResolveOperation (ec);
 
-
-                       eclass = ExprClass.Value;
+                       expr = orig_expr;
                        type = expr.Type;
-                       return this;
+
+                       return res;
                }
 
-               void DoEmit (EmitContext ec, bool is_expr)
+               protected override void EmitOperation (EmitContext ec)
                {
                        Label is_null_label = ec.DefineLabel ();
                        Label end_label = ec.DefineLabel ();
 
-                       unwrap.EmitCheck (ec);
+                       LocalTemporary lt = new LocalTemporary (type);
+
+                       // Value is on the stack
+                       lt.Store (ec);
+
+                       var call = new CallEmitter ();
+                       call.InstanceExpression = lt;
+                       call.EmitPredefined (ec, NullableInfo.GetHasValue (expr.Type), null);
+
                        ec.Emit (OpCodes.Brfalse, is_null_label);
 
-                       if (is_expr) {
-                               underlying.Emit (ec);
-                               ec.Emit (OpCodes.Br_S, end_label);
-                       } else {
-                               underlying.EmitStatement (ec);
-                       }
+                       call = new CallEmitter ();
+                       call.InstanceExpression = lt;
+                       call.EmitPredefined (ec, NullableInfo.GetValue (expr.Type), null);
 
-                       ec.MarkLabel (is_null_label);
-                       if (is_expr)
-                               LiftedNull.Create (type, loc).Emit (ec);
+                       lt.Release (ec);
 
-                       ec.MarkLabel (end_label);
-               }
+                       base.EmitOperation (ec);
 
-               public override void Emit (EmitContext ec)
-               {
-                       DoEmit (ec, true);
-               }
+                       ec.Emit (OpCodes.Newobj, NullableInfo.GetConstructor (type));
+                       ec.Emit (OpCodes.Br_S, end_label);
 
-               public override void EmitStatement (EmitContext ec)
-               {
-                       DoEmit (ec, false);
+                       ec.MarkLabel (is_null_label);
+                       LiftedNull.Create (type, loc).Emit (ec);
+
+                       ec.MarkLabel (end_label);
                }
        }
 }