Better check for instance equality of generic types. Fixes #15100
[mono.git] / mcs / mcs / cfold.cs
index a23a20a122cf186f500363663fb6e52710d62706..96062f2748e744c51360f607ad2de8f492dc889d 100644 (file)
@@ -6,17 +6,21 @@
 //   Marek Safar (marek.safar@seznam.cz)
 //
 // Copyright 2002, 2003 Ximian, Inc.
-// Copyright 2003-2008, Novell, Inc.
+// Copyright 2003-2011, Novell, Inc.
 // 
 using System;
 
 namespace Mono.CSharp {
 
-       public class ConstantFold {
-
-               public static readonly Type[] binary_promotions = new Type[] { 
-                       TypeManager.decimal_type, TypeManager.double_type, TypeManager.float_type,
-                       TypeManager.uint64_type, TypeManager.int64_type, TypeManager.uint32_type };
+       public static class ConstantFold
+       {
+               public static TypeSpec[] CreateBinaryPromotionsTypes (BuiltinTypes types)
+               {
+                       return new TypeSpec[] { 
+                               types.Decimal, types.Double, types.Float,
+                               types.ULong, types.Long, types.UInt
+                       };
+               }
 
                //
                // Performs the numeric promotions on the left and right expresions
@@ -25,25 +29,28 @@ namespace Mono.CSharp {
                // On success, the types of `lc' and `rc' on output will always match,
                // and the pair will be one of:
                //
-               static bool DoBinaryNumericPromotions (ref Constant left, ref Constant right)
+               // TODO: BinaryFold should be called as an optimization step only,
+               // error checking here is weak
+               //              
+               static bool DoBinaryNumericPromotions (ResolveContext rc, ref Constant left, ref Constant right)
                {
-                       Type ltype = left.Type;
-                       Type rtype = right.Type;
+                       TypeSpec ltype = left.Type;
+                       TypeSpec rtype = right.Type;
 
-                       foreach (Type t in binary_promotions) {
+                       foreach (TypeSpec t in rc.BuiltinTypes.BinaryPromotionsTypes) {
                                if (t == ltype)
-                                       return t == rtype || ConvertPromotion (ref right, ref left, t);
+                                       return t == rtype || ConvertPromotion (rc, ref right, ref left, t);
 
                                if (t == rtype)
-                                       return t == ltype || ConvertPromotion (ref left, ref right, t);
+                                       return t == ltype || ConvertPromotion (rc, ref left, ref right, t);
                        }
 
-                       left = left.ConvertImplicitly (TypeManager.int32_type);
-                       right = right.ConvertImplicitly (TypeManager.int32_type);
+                       left = left.ConvertImplicitly (rc.BuiltinTypes.Int);
+                       right = right.ConvertImplicitly (rc.BuiltinTypes.Int);
                        return left != null && right != null;
                }
 
-               static bool ConvertPromotion (ref Constant prim, ref Constant second, Type type)
+               static bool ConvertPromotion (ResolveContext rc, ref Constant prim, ref Constant second, TypeSpec type)
                {
                        Constant c = prim.ConvertImplicitly (type);
                        if (c != null) {
@@ -51,8 +58,8 @@ namespace Mono.CSharp {
                                return true;
                        }
 
-                       if (type == TypeManager.uint32_type) {
-                               type = TypeManager.int64_type;
+                       if (type.BuiltinType == BuiltinTypeSpec.Type.UInt) {
+                               type = rc.BuiltinTypes.Long;
                                prim = prim.ConvertImplicitly (type);
                                second = second.ConvertImplicitly (type);
                                return prim != null && second != null;
@@ -61,9 +68,9 @@ namespace Mono.CSharp {
                        return false;
                }
 
-               internal static void Error_CompileTimeOverflow (Location loc)
+               internal static void Error_CompileTimeOverflow (ResolveContext rc, Location loc)
                {
-                       Report.Error (220, loc, "The operation overflows at compile time in checked mode");
+                       rc.Report.Error (220, loc, "The operation overflows at compile time in checked mode");
                }
                
                /// <summary>
@@ -71,7 +78,7 @@ namespace Mono.CSharp {
                ///
                ///   Returns null if the expression can not be folded.
                /// </summary>
-               static public Constant BinaryFold (EmitContext ec, Binary.Operator oper,
+               static public Constant BinaryFold (ResolveContext ec, Binary.Operator oper,
                                                     Constant left, Constant right, Location loc)
                {
                        Constant result = null;
@@ -96,26 +103,26 @@ namespace Mono.CSharp {
                                return new SideEffectConstant (result, right, loc);
                        }
 
-                       Type lt = left.Type;
-                       Type rt = right.Type;
+                       TypeSpec lt = left.Type;
+                       TypeSpec rt = right.Type;
                        bool bool_res;
 
-                       if (lt == TypeManager.bool_type && lt == rt) {
+                       if (lt.BuiltinType == BuiltinTypeSpec.Type.Bool && lt == rt) {
                                bool lv = (bool) left.GetValue ();
                                bool rv = (bool) right.GetValue ();                     
                                switch (oper) {
                                case Binary.Operator.BitwiseAnd:
                                case Binary.Operator.LogicalAnd:
-                                       return new BoolConstant (lv && rv, left.Location);
+                                       return new BoolConstant (ec.BuiltinTypes, lv && rv, left.Location);
                                case Binary.Operator.BitwiseOr:
                                case Binary.Operator.LogicalOr:
-                                       return new BoolConstant (lv || rv, left.Location);
+                                       return new BoolConstant (ec.BuiltinTypes, lv || rv, left.Location);
                                case Binary.Operator.ExclusiveOr:
-                                       return new BoolConstant (lv ^ rv, left.Location);
+                                       return new BoolConstant (ec.BuiltinTypes, lv ^ rv, left.Location);
                                case Binary.Operator.Equality:
-                                       return new BoolConstant (lv == rv, left.Location);
+                                       return new BoolConstant (ec.BuiltinTypes, lv == rv, left.Location);
                                case Binary.Operator.Inequality:
-                                       return new BoolConstant (lv != rv, left.Location);
+                                       return new BoolConstant (ec.BuiltinTypes, lv != rv, left.Location);
                                }
                                return null;
                        }
@@ -124,7 +131,7 @@ namespace Mono.CSharp {
                        // During an enum evaluation, none of the rules are valid
                        // Not sure whether it is bug in csc or in documentation
                        //
-                       if (ec.InEnumContext){
+                       if (ec.HasSet (ResolveContext.Options.EnumScope)){
                                if (left is EnumConstant)
                                        left = ((EnumConstant) left).Child;
                                
@@ -140,15 +147,19 @@ namespace Mono.CSharp {
                                        case Binary.Operator.BitwiseOr:
                                        case Binary.Operator.BitwiseAnd:
                                        case Binary.Operator.ExclusiveOr:
-                                               return BinaryFold (ec, oper, ((EnumConstant)left).Child,
-                                                               ((EnumConstant)right).Child, loc).TryReduce (ec, lt, loc);
+                                               result = BinaryFold (ec, oper, ((EnumConstant)left).Child, ((EnumConstant)right).Child, loc);
+                                               if (result != null)
+                                                       result = result.Reduce (ec, lt);
+                                               return result;
 
                                        ///
                                        /// U operator -(E x, E y);
                                        /// 
                                        case Binary.Operator.Subtraction:
                                                result = BinaryFold (ec, oper, ((EnumConstant)left).Child, ((EnumConstant)right).Child, loc);
-                                               return result.TryReduce (ec, ((EnumConstant)left).Child.Type, loc);
+                                               if (result != null)
+                                                       result = result.Reduce (ec, EnumSpec.GetUnderlyingType (lt));
+                                               return result;
 
                                        ///
                                        /// bool operator ==(E x, E y);
@@ -171,34 +182,68 @@ namespace Mono.CSharp {
 
                        switch (oper){
                        case Binary.Operator.BitwiseOr:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               //
+                               // bool? operator |(bool? x, bool? y);
+                               //
+                               if ((lt.BuiltinType == BuiltinTypeSpec.Type.Bool && right is NullLiteral) ||
+                                       (rt.BuiltinType == BuiltinTypeSpec.Type.Bool && left is NullLiteral)) {
+                                       var b = new Binary (oper, left, right).ResolveOperator (ec);
+
+                                       // false | null => null
+                                       // null | false => null
+                                       if ((right is NullLiteral && left.IsDefaultValue) || (left is NullLiteral && right.IsDefaultValue))
+                                               return Nullable.LiftedNull.CreateFromExpression (ec, b);
+
+                                       // true | null => true
+                                       // null | true => true
+                                       return ReducedExpression.Create (new BoolConstant (ec.BuiltinTypes, true, loc), b);                                     
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                if (left is IntConstant){
                                        int res = ((IntConstant) left).Value | ((IntConstant) right).Value;
-                                       
-                                       return new IntConstant (res, left.Location);
+
+                                       return new IntConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is UIntConstant){
                                        uint res = ((UIntConstant)left).Value | ((UIntConstant)right).Value;
-                                       
-                                       return new UIntConstant (res, left.Location);
+
+                                       return new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is LongConstant){
                                        long res = ((LongConstant)left).Value | ((LongConstant)right).Value;
-                                       
-                                       return new LongConstant (res, left.Location);
+
+                                       return new LongConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is ULongConstant){
                                        ulong res = ((ULongConstant)left).Value |
                                                ((ULongConstant)right).Value;
-                                       
-                                       return new ULongConstant (res, left.Location);
+
+                                       return new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                break;
                                
                        case Binary.Operator.BitwiseAnd:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               //
+                               // bool? operator &(bool? x, bool? y);
+                               //
+                               if ((lt.BuiltinType == BuiltinTypeSpec.Type.Bool && right is NullLiteral) ||
+                                       (rt.BuiltinType == BuiltinTypeSpec.Type.Bool && left is NullLiteral)) {
+                                       var b = new Binary (oper, left, right).ResolveOperator (ec);
+
+                                       // false & null => false
+                                       // null & false => false
+                                       if ((right is NullLiteral && left.IsDefaultValue) || (left is NullLiteral && right.IsDefaultValue))
+                                               return ReducedExpression.Create (new BoolConstant (ec.BuiltinTypes, false, loc), b);
+
+                                       // true & null => null
+                                       // null & true => null
+                                       return Nullable.LiftedNull.CreateFromExpression (ec, b);
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
                                
                                ///
@@ -209,70 +254,96 @@ namespace Mono.CSharp {
                                ///
                                if (left is IntConstant){
                                        int res = ((IntConstant) left).Value & ((IntConstant) right).Value;
-                                       return new IntConstant (res, left.Location);
+                                       return new IntConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is UIntConstant){
                                        uint res = ((UIntConstant)left).Value & ((UIntConstant)right).Value;
-                                       return new UIntConstant (res, left.Location);
+                                       return new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is LongConstant){
                                        long res = ((LongConstant)left).Value & ((LongConstant)right).Value;
-                                       return new LongConstant (res, left.Location);
+                                       return new LongConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is ULongConstant){
                                        ulong res = ((ULongConstant)left).Value &
                                                ((ULongConstant)right).Value;
-                                       
-                                       return new ULongConstant (res, left.Location);
+
+                                       return new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                break;
 
                        case Binary.Operator.ExclusiveOr:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
                                
                                if (left is IntConstant){
                                        int res = ((IntConstant) left).Value ^ ((IntConstant) right).Value;
-                                       return new IntConstant (res, left.Location);
+                                       return new IntConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is UIntConstant){
                                        uint res = ((UIntConstant)left).Value ^ ((UIntConstant)right).Value;
-                                       
-                                       return  new UIntConstant (res, left.Location);
+
+                                       return new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is LongConstant){
                                        long res = ((LongConstant)left).Value ^ ((LongConstant)right).Value;
-                                       
-                                       return new LongConstant (res, left.Location);
+
+                                       return new LongConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                if (left is ULongConstant){
                                        ulong res = ((ULongConstant)left).Value ^
                                                ((ULongConstant)right).Value;
-                                       
-                                       return new ULongConstant (res, left.Location);
+
+                                       return new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                }
                                break;
 
                        case Binary.Operator.Addition:
-                               if (lt == TypeManager.null_type)
-                                       return right;
-
-                               if (rt == TypeManager.null_type)
-                                       return left;
-
                                //
-                               // If both sides are strings, then concatenate, if
-                               // one is a string, and the other is not, then defer
-                               // to runtime concatenation
+                               // If both sides are strings, then concatenate
                                //
-                               if (lt == TypeManager.string_type || rt == TypeManager.string_type){
+                               // string operator + (string x, string y)
+                               //
+                               if (lt.BuiltinType == BuiltinTypeSpec.Type.String || rt.BuiltinType == BuiltinTypeSpec.Type.String){
                                        if (lt == rt)
-                                               return new StringConstant ((string)left.GetValue () + (string)right.GetValue (),
+                                               return new StringConstant (ec.BuiltinTypes, (string)left.GetValue () + (string)right.GetValue (),
                                                        left.Location);
-                                       
+
+                                       if (lt == InternalType.NullLiteral)
+                                               return new StringConstant (ec.BuiltinTypes, "" + right.GetValue (), left.Location);
+
+                                       if (rt == InternalType.NullLiteral)
+                                               return new StringConstant (ec.BuiltinTypes, left.GetValue () + "", left.Location);
+
                                        return null;
                                }
 
+                               //
+                               // string operator + (string x, object y)
+                               //
+                               if (lt == InternalType.NullLiteral) {
+                                       if (rt.BuiltinType == BuiltinTypeSpec.Type.Object)
+                                               return new StringConstant (ec.BuiltinTypes, "" + right.GetValue (), left.Location);
+
+                                       if (lt == rt) {
+                                               ec.Report.Error (34, loc, "Operator `{0}' is ambiguous on operands of type `{1}' and `{2}'",
+                                                       "+", lt.GetSignatureForError (), rt.GetSignatureForError ());
+                                               return null;
+                                       }
+
+                                       return right;
+                               }
+
+                               //
+                               // string operator + (object x, string y)
+                               //
+                               if (rt == InternalType.NullLiteral) {
+                                       if (lt.BuiltinType == BuiltinTypeSpec.Type.Object)
+                                               return new StringConstant (ec.BuiltinTypes, right.GetValue () + "", left.Location);
+       
+                                       return left;
+                               }
+
                                //
                                // handle "E operator + (E x, U y)"
                                // handle "E operator + (Y y, E x)"
@@ -295,14 +366,14 @@ namespace Mono.CSharp {
                                        if (result == null)
                                                return null;
 
-                                       result = result.TryReduce (ec, lt, loc);
+                                       result = result.Reduce (ec, lt);
                                        if (result == null)
                                                return null;
 
                                        return new EnumConstant (result, lt);
                                }
 
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                try {
@@ -315,8 +386,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((DoubleConstant) left).Value +
                                                                         ((DoubleConstant) right).Value);
-                                               
-                                               return new DoubleConstant (res, left.Location);
+
+                                               return new DoubleConstant (ec.BuiltinTypes, res, left.Location);
                                        }
                                        if (left is FloatConstant){
                                                float res;
@@ -327,8 +398,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((FloatConstant) left).Value +
                                                                         ((FloatConstant) right).Value);
-                                               
-                                               result = new FloatConstant (res, left.Location);
+
+                                               result = new FloatConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is ULongConstant){
                                                ulong res;
                                                
@@ -339,7 +410,7 @@ namespace Mono.CSharp {
                                                        res = unchecked (((ULongConstant) left).Value +
                                                                         ((ULongConstant) right).Value);
 
-                                               result = new ULongConstant (res, left.Location);
+                                               result = new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is LongConstant){
                                                long res;
                                                
@@ -349,8 +420,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((LongConstant) left).Value +
                                                                         ((LongConstant) right).Value);
-                                               
-                                               result = new LongConstant (res, left.Location);
+
+                                               result = new LongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is UIntConstant){
                                                uint res;
                                                
@@ -360,8 +431,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((UIntConstant) left).Value +
                                                                         ((UIntConstant) right).Value);
-                                               
-                                               result = new UIntConstant (res, left.Location);
+
+                                               result = new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is IntConstant){
                                                int res;
 
@@ -372,7 +443,7 @@ namespace Mono.CSharp {
                                                        res = unchecked (((IntConstant) left).Value +
                                                                         ((IntConstant) right).Value);
 
-                                               result = new IntConstant (res, left.Location);
+                                               result = new IntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is DecimalConstant) {
                                                decimal res;
 
@@ -383,10 +454,10 @@ namespace Mono.CSharp {
                                                        res = unchecked (((DecimalConstant) left).Value +
                                                                ((DecimalConstant) right).Value);
 
-                                               result = new DecimalConstant (res, left.Location);
+                                               result = new DecimalConstant (ec.BuiltinTypes, res, left.Location);
                                        }
                                } catch (OverflowException){
-                                       Error_CompileTimeOverflow (loc);
+                                       Error_CompileTimeOverflow (ec, loc);
                                }
 
                                return result;
@@ -414,14 +485,20 @@ namespace Mono.CSharp {
                                        if (result == null)
                                                return null;
 
-                                       result = result.TryReduce (ec, lt, loc);
+                                       result = result.Reduce (ec, lt);
                                        if (result == null)
                                                return null;
 
                                        return new EnumConstant (result, lt);
                                }
 
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (left is NullLiteral && right is NullLiteral) {
+                                       var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                       lifted_int.ResolveAsType (ec);
+                                       return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                try {
@@ -434,8 +511,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((DoubleConstant) left).Value -
                                                                         ((DoubleConstant) right).Value);
-                                               
-                                               result = new DoubleConstant (res, left.Location);
+
+                                               result = new DoubleConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is FloatConstant){
                                                float res;
                                                
@@ -445,8 +522,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((FloatConstant) left).Value -
                                                                         ((FloatConstant) right).Value);
-                                               
-                                               result = new FloatConstant (res, left.Location);
+
+                                               result = new FloatConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is ULongConstant){
                                                ulong res;
                                                
@@ -456,8 +533,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((ULongConstant) left).Value -
                                                                         ((ULongConstant) right).Value);
-                                               
-                                               result = new ULongConstant (res, left.Location);
+
+                                               result = new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is LongConstant){
                                                long res;
                                                
@@ -467,8 +544,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((LongConstant) left).Value -
                                                                         ((LongConstant) right).Value);
-                                               
-                                               result = new LongConstant (res, left.Location);
+
+                                               result = new LongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is UIntConstant){
                                                uint res;
                                                
@@ -478,8 +555,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((UIntConstant) left).Value -
                                                                         ((UIntConstant) right).Value);
-                                               
-                                               result = new UIntConstant (res, left.Location);
+
+                                               result = new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is IntConstant){
                                                int res;
 
@@ -490,7 +567,7 @@ namespace Mono.CSharp {
                                                        res = unchecked (((IntConstant) left).Value -
                                                                         ((IntConstant) right).Value);
 
-                                               result = new IntConstant (res, left.Location);
+                                               result = new IntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is DecimalConstant) {
                                                decimal res;
 
@@ -501,18 +578,24 @@ namespace Mono.CSharp {
                                                        res = unchecked (((DecimalConstant) left).Value -
                                                                ((DecimalConstant) right).Value);
 
-                                               return new DecimalConstant (res, left.Location);
+                                               return new DecimalConstant (ec.BuiltinTypes, res, left.Location);
                                        } else {
                                                throw new Exception ( "Unexepected subtraction input: " + left);
                                        }
                                } catch (OverflowException){
-                                       Error_CompileTimeOverflow (loc);
+                                       Error_CompileTimeOverflow (ec, loc);
                                }
 
                                return result;
                                
                        case Binary.Operator.Multiply:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (left is NullLiteral && right is NullLiteral) {
+                                       var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                       lifted_int.ResolveAsType (ec);
+                                       return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                try {
@@ -525,8 +608,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((DoubleConstant) left).Value *
                                                                ((DoubleConstant) right).Value);
-                                               
-                                               return new DoubleConstant (res, left.Location);
+
+                                               return new DoubleConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is FloatConstant){
                                                float res;
                                                
@@ -536,8 +619,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((FloatConstant) left).Value *
                                                                ((FloatConstant) right).Value);
-                                               
-                                               return new FloatConstant (res, left.Location);
+
+                                               return new FloatConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is ULongConstant){
                                                ulong res;
                                                
@@ -547,8 +630,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((ULongConstant) left).Value *
                                                                ((ULongConstant) right).Value);
-                                               
-                                               return new ULongConstant (res, left.Location);
+
+                                               return new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is LongConstant){
                                                long res;
                                                
@@ -558,8 +641,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((LongConstant) left).Value *
                                                                ((LongConstant) right).Value);
-                                               
-                                               return new LongConstant (res, left.Location);
+
+                                               return new LongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is UIntConstant){
                                                uint res;
                                                
@@ -569,8 +652,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((UIntConstant) left).Value *
                                                                ((UIntConstant) right).Value);
-                                               
-                                               return new UIntConstant (res, left.Location);
+
+                                               return new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is IntConstant){
                                                int res;
 
@@ -581,7 +664,7 @@ namespace Mono.CSharp {
                                                        res = unchecked (((IntConstant) left).Value *
                                                                ((IntConstant) right).Value);
 
-                                               return new IntConstant (res, left.Location);
+                                               return new IntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is DecimalConstant) {
                                                decimal res;
 
@@ -592,17 +675,23 @@ namespace Mono.CSharp {
                                                        res = unchecked (((DecimalConstant) left).Value *
                                                                ((DecimalConstant) right).Value);
 
-                                               return new DecimalConstant (res, left.Location);
+                                               return new DecimalConstant (ec.BuiltinTypes, res, left.Location);
                                        } else {
                                                throw new Exception ( "Unexepected multiply input: " + left);
                                        }
                                } catch (OverflowException){
-                                       Error_CompileTimeOverflow (loc);
+                                       Error_CompileTimeOverflow (ec, loc);
                                }
                                break;
 
                        case Binary.Operator.Division:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (left is NullLiteral && right is NullLiteral) {
+                                       var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                       lifted_int.ResolveAsType (ec);
+                                       return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                try {
@@ -615,8 +704,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((DoubleConstant) left).Value /
                                                                ((DoubleConstant) right).Value);
-                                               
-                                               return new DoubleConstant (res, left.Location);
+
+                                               return new DoubleConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is FloatConstant){
                                                float res;
                                                
@@ -626,8 +715,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((FloatConstant) left).Value /
                                                                ((FloatConstant) right).Value);
-                                               
-                                               return new FloatConstant (res, left.Location);
+
+                                               return new FloatConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is ULongConstant){
                                                ulong res;
                                                
@@ -637,8 +726,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((ULongConstant) left).Value /
                                                                ((ULongConstant) right).Value);
-                                               
-                                               return new ULongConstant (res, left.Location);
+
+                                               return new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is LongConstant){
                                                long res;
                                                
@@ -648,8 +737,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((LongConstant) left).Value /
                                                                ((LongConstant) right).Value);
-                                               
-                                               return new LongConstant (res, left.Location);
+
+                                               return new LongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is UIntConstant){
                                                uint res;
                                                
@@ -659,8 +748,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((UIntConstant) left).Value /
                                                                ((UIntConstant) right).Value);
-                                               
-                                               return new UIntConstant (res, left.Location);
+
+                                               return new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is IntConstant){
                                                int res;
 
@@ -671,7 +760,7 @@ namespace Mono.CSharp {
                                                        res = unchecked (((IntConstant) left).Value /
                                                                ((IntConstant) right).Value);
 
-                                               return new IntConstant (res, left.Location);
+                                               return new IntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is DecimalConstant) {
                                                decimal res;
 
@@ -682,21 +771,27 @@ namespace Mono.CSharp {
                                                        res = unchecked (((DecimalConstant) left).Value /
                                                                ((DecimalConstant) right).Value);
 
-                                               return new DecimalConstant (res, left.Location);
+                                               return new DecimalConstant (ec.BuiltinTypes, res, left.Location);
                                        } else {
                                                throw new Exception ( "Unexepected division input: " + left);
                                        }
                                } catch (OverflowException){
-                                       Error_CompileTimeOverflow (loc);
+                                       Error_CompileTimeOverflow (ec, loc);
 
                                } catch (DivideByZeroException) {
-                                       Report.Error (020, loc, "Division by constant zero");
+                                       ec.Report.Error (20, loc, "Division by constant zero");
                                }
                                
                                break;
                                
                        case Binary.Operator.Modulus:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (left is NullLiteral && right is NullLiteral) {
+                                       var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                       lifted_int.ResolveAsType (ec);
+                                       return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                try {
@@ -709,8 +804,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((DoubleConstant) left).Value %
                                                                         ((DoubleConstant) right).Value);
-                                               
-                                               return new DoubleConstant (res, left.Location);
+
+                                               return new DoubleConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is FloatConstant){
                                                float res;
                                                
@@ -720,8 +815,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((FloatConstant) left).Value %
                                                                         ((FloatConstant) right).Value);
-                                               
-                                               return new FloatConstant (res, left.Location);
+
+                                               return new FloatConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is ULongConstant){
                                                ulong res;
                                                
@@ -731,8 +826,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((ULongConstant) left).Value %
                                                                         ((ULongConstant) right).Value);
-                                               
-                                               return new ULongConstant (res, left.Location);
+
+                                               return new ULongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is LongConstant){
                                                long res;
                                                
@@ -742,8 +837,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((LongConstant) left).Value %
                                                                         ((LongConstant) right).Value);
-                                               
-                                               return new LongConstant (res, left.Location);
+
+                                               return new LongConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is UIntConstant){
                                                uint res;
                                                
@@ -753,8 +848,8 @@ namespace Mono.CSharp {
                                                else
                                                        res = unchecked (((UIntConstant) left).Value %
                                                                         ((UIntConstant) right).Value);
-                                               
-                                               return new UIntConstant (res, left.Location);
+
+                                               return new UIntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else if (left is IntConstant){
                                                int res;
 
@@ -765,14 +860,14 @@ namespace Mono.CSharp {
                                                        res = unchecked (((IntConstant) left).Value %
                                                                         ((IntConstant) right).Value);
 
-                                               return new IntConstant (res, left.Location);
+                                               return new IntConstant (ec.BuiltinTypes, res, left.Location);
                                        } else {
                                                throw new Exception ( "Unexepected modulus input: " + left);
                                        }
                                } catch (DivideByZeroException){
-                                       Report.Error (020, loc, "Division by constant zero");
+                                       ec.Report.Error (20, loc, "Division by constant zero");
                                } catch (OverflowException){
-                                       Error_CompileTimeOverflow (loc);
+                                       Error_CompileTimeOverflow (ec, loc);
                                }
                                break;
 
@@ -780,73 +875,93 @@ namespace Mono.CSharp {
                                // There is no overflow checking on left shift
                                //
                        case Binary.Operator.LeftShift:
-                               IntConstant ic = right.ConvertImplicitly (TypeManager.int32_type) as IntConstant;
+                               if (left is NullLiteral && right is NullLiteral) {
+                                       var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                       lifted_int.ResolveAsType (ec);
+                                       return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                               }
+
+                               IntConstant ic = right.ConvertImplicitly (ec.BuiltinTypes.Int) as IntConstant;
                                if (ic == null){
-                                       Binary.Error_OperatorCannotBeApplied (left, right, oper, loc);
+                                       Binary.Error_OperatorCannotBeApplied (ec, left, right, oper, loc);
                                        return null;
                                }
 
                                int lshift_val = ic.Value;
-                               if (left.Type == TypeManager.uint64_type)
-                                       return new ULongConstant (((ULongConstant)left).Value << lshift_val, left.Location);
-                               if (left.Type == TypeManager.int64_type)
-                                       return new LongConstant (((LongConstant)left).Value << lshift_val, left.Location);
-                               if (left.Type == TypeManager.uint32_type)
-                                       return new UIntConstant (((UIntConstant)left).Value << lshift_val, left.Location);
-
-                               left = left.ConvertImplicitly (TypeManager.int32_type);
-                               if (left.Type == TypeManager.int32_type)
-                                       return new IntConstant (((IntConstant)left).Value << lshift_val, left.Location);
-
-                               Binary.Error_OperatorCannotBeApplied (left, right, oper, loc);
+                               switch (left.Type.BuiltinType) {
+                               case BuiltinTypeSpec.Type.ULong:
+                                       return new ULongConstant (ec.BuiltinTypes, ((ULongConstant) left).Value << lshift_val, left.Location);
+                               case BuiltinTypeSpec.Type.Long:
+                                       return new LongConstant (ec.BuiltinTypes, ((LongConstant) left).Value << lshift_val, left.Location);
+                               case BuiltinTypeSpec.Type.UInt:
+                                       return new UIntConstant (ec.BuiltinTypes, ((UIntConstant) left).Value << lshift_val, left.Location);
+                               }
+
+                               // null << value => null
+                               if (left is NullLiteral)
+                                       return (Constant) new Binary (oper, left, right).ResolveOperator (ec);
+
+                               left = left.ConvertImplicitly (ec.BuiltinTypes.Int);
+                               if (left.Type.BuiltinType == BuiltinTypeSpec.Type.Int)
+                                       return new IntConstant (ec.BuiltinTypes, ((IntConstant) left).Value << lshift_val, left.Location);
+
+                               Binary.Error_OperatorCannotBeApplied (ec, left, right, oper, loc);
                                break;
 
                                //
                                // There is no overflow checking on right shift
                                //
                        case Binary.Operator.RightShift:
-                               IntConstant sic = right.ConvertImplicitly (TypeManager.int32_type) as IntConstant;
+                               if (left is NullLiteral && right is NullLiteral) {
+                                       var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                       lifted_int.ResolveAsType (ec);
+                                       return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                               }
+
+                               IntConstant sic = right.ConvertImplicitly (ec.BuiltinTypes.Int) as IntConstant;
                                if (sic == null){
-                                       Binary.Error_OperatorCannotBeApplied (left, right, oper, loc); ;
+                                       Binary.Error_OperatorCannotBeApplied (ec, left, right, oper, loc);
                                        return null;
                                }
                                int rshift_val = sic.Value;
-                               if (left.Type == TypeManager.uint64_type)
-                                       return new ULongConstant (((ULongConstant)left).Value >> rshift_val, left.Location);
-                               if (left.Type == TypeManager.int64_type)
-                                       return new LongConstant (((LongConstant)left).Value >> rshift_val, left.Location);
-                               if (left.Type == TypeManager.uint32_type)
-                                       return new UIntConstant (((UIntConstant)left).Value >> rshift_val, left.Location);
-
-                               left = left.ConvertImplicitly (TypeManager.int32_type);
-                               if (left.Type == TypeManager.int32_type)
-                                       return new IntConstant (((IntConstant)left).Value >> rshift_val, left.Location);
-
-                               Binary.Error_OperatorCannotBeApplied (left, right, oper, loc);
+                               switch (left.Type.BuiltinType) {
+                               case BuiltinTypeSpec.Type.ULong:
+                                       return new ULongConstant (ec.BuiltinTypes, ((ULongConstant) left).Value >> rshift_val, left.Location);
+                               case BuiltinTypeSpec.Type.Long:
+                                       return new LongConstant (ec.BuiltinTypes, ((LongConstant) left).Value >> rshift_val, left.Location);
+                               case BuiltinTypeSpec.Type.UInt:
+                                       return new UIntConstant (ec.BuiltinTypes, ((UIntConstant) left).Value >> rshift_val, left.Location);
+                               }
+
+                               // null >> value => null
+                               if (left is NullLiteral)
+                                       return (Constant) new Binary (oper, left, right).ResolveOperator (ec);
+
+                               left = left.ConvertImplicitly (ec.BuiltinTypes.Int);
+                               if (left.Type.BuiltinType == BuiltinTypeSpec.Type.Int)
+                                       return new IntConstant (ec.BuiltinTypes, ((IntConstant) left).Value >> rshift_val, left.Location);
+
+                               Binary.Error_OperatorCannotBeApplied (ec, left, right, oper, loc);
                                break;
 
                        case Binary.Operator.Equality:
-                               if (left is NullLiteral){
-                                       if (right is NullLiteral)
-                                               return new BoolConstant (true, left.Location);
-                                       else if (right is StringConstant)
-                                               return new BoolConstant (
-                                                       ((StringConstant) right).Value == null, left.Location);
-                               } else if (right is NullLiteral) {
-                                       if (left is NullLiteral)
-                                               return new BoolConstant (true, left.Location);
-                                       else if (left is StringConstant)
-                                               return new BoolConstant (
-                                                       ((StringConstant) left).Value == null, left.Location);
-                               }
-                               if (left is StringConstant && right is StringConstant){
-                                       return new BoolConstant (
-                                               ((StringConstant) left).Value ==
-                                               ((StringConstant) right).Value, left.Location);
-                                       
+                               if (TypeSpec.IsReferenceType (lt) && TypeSpec.IsReferenceType (rt) ||
+                                       (left is Nullable.LiftedNull && right.IsNull) ||
+                                       (right is Nullable.LiftedNull && left.IsNull)) {
+                                       if (left.IsNull || right.IsNull) {
+                                               return ReducedExpression.Create (
+                                                       new BoolConstant (ec.BuiltinTypes, left.IsNull == right.IsNull, left.Location),
+                                                       new Binary (oper, left, right));
+                                       }
+
+                                       if (left is StringConstant && right is StringConstant)
+                                               return new BoolConstant (ec.BuiltinTypes,
+                                                       ((StringConstant) left).Value == ((StringConstant) right).Value, left.Location);
+
+                                       return null;
                                }
 
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                bool_res = false;
@@ -871,30 +986,26 @@ namespace Mono.CSharp {
                                else
                                        return null;
 
-                               return new BoolConstant (bool_res, left.Location);
+                               return new BoolConstant (ec.BuiltinTypes, bool_res, left.Location);
 
                        case Binary.Operator.Inequality:
-                               if (left is NullLiteral) {
-                                       if (right is NullLiteral)
-                                               return new BoolConstant (false, left.Location);
-                                       else if (right is StringConstant)
-                                               return new BoolConstant (
-                                                       ((StringConstant) right).Value != null, left.Location);
-                               } else if (right is NullLiteral) {
-                                       if (left is NullLiteral)
-                                               return new BoolConstant (false, left.Location);
-                                       else if (left is StringConstant)
-                                               return new BoolConstant (
-                                                       ((StringConstant) left).Value != null, left.Location);
-                               }
-                               if (left is StringConstant && right is StringConstant){
-                                       return new BoolConstant (
-                                               ((StringConstant) left).Value !=
-                                               ((StringConstant) right).Value, left.Location);
-                                       
+                               if (TypeSpec.IsReferenceType (lt) && TypeSpec.IsReferenceType (rt) ||
+                                       (left is Nullable.LiftedNull && right.IsNull) ||
+                                       (right is Nullable.LiftedNull && left.IsNull)) {
+                                       if (left.IsNull || right.IsNull) {
+                                               return ReducedExpression.Create (
+                                                       new BoolConstant (ec.BuiltinTypes, left.IsNull != right.IsNull, left.Location),
+                                                       new Binary (oper, left, right));
+                                       }
+
+                                       if (left is StringConstant && right is StringConstant)
+                                               return new BoolConstant (ec.BuiltinTypes,
+                                                       ((StringConstant) left).Value != ((StringConstant) right).Value, left.Location);
+
+                                       return null;
                                }
 
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                bool_res = false;
@@ -919,10 +1030,18 @@ namespace Mono.CSharp {
                                else
                                        return null;
 
-                               return new BoolConstant (bool_res, left.Location);
+                               return new BoolConstant (ec.BuiltinTypes, bool_res, left.Location);
 
                        case Binary.Operator.LessThan:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (right is NullLiteral) {
+                                       if (left is NullLiteral) {
+                                               var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                               lifted_int.ResolveAsType (ec);
+                                               return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                                       }
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                bool_res = false;
@@ -947,10 +1066,18 @@ namespace Mono.CSharp {
                                else
                                        return null;
 
-                               return new BoolConstant (bool_res, left.Location);
+                               return new BoolConstant (ec.BuiltinTypes, bool_res, left.Location);
                                
                        case Binary.Operator.GreaterThan:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (right is NullLiteral) {
+                                       if (left is NullLiteral) {
+                                               var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                               lifted_int.ResolveAsType (ec);
+                                               return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                                       }
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                bool_res = false;
@@ -975,10 +1102,18 @@ namespace Mono.CSharp {
                                else
                                        return null;
 
-                               return new BoolConstant (bool_res, left.Location);
+                               return new BoolConstant (ec.BuiltinTypes, bool_res, left.Location);
 
                        case Binary.Operator.GreaterThanOrEqual:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (right is NullLiteral) {
+                                       if (left is NullLiteral) {
+                                               var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                               lifted_int.ResolveAsType (ec);
+                                               return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                                       }
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                bool_res = false;
@@ -1003,10 +1138,18 @@ namespace Mono.CSharp {
                                else
                                        return null;
 
-                               return new BoolConstant (bool_res, left.Location);
+                               return new BoolConstant (ec.BuiltinTypes, bool_res, left.Location);
 
                        case Binary.Operator.LessThanOrEqual:
-                               if (!DoBinaryNumericPromotions (ref left, ref right))
+                               if (right is NullLiteral) {
+                                       if (left is NullLiteral) {
+                                               var lifted_int = new Nullable.NullableType (ec.BuiltinTypes.Int, loc);
+                                               lifted_int.ResolveAsType (ec);
+                                               return (Constant) new Binary (oper, lifted_int, right).ResolveOperator (ec);
+                                       }
+                               }
+
+                               if (!DoBinaryNumericPromotions (ec, ref left, ref right))
                                        return null;
 
                                bool_res = false;
@@ -1031,7 +1174,7 @@ namespace Mono.CSharp {
                                else
                                        return null;
 
-                               return new BoolConstant (bool_res, left.Location);
+                               return new BoolConstant (ec.BuiltinTypes, bool_res, left.Location);
                        }
                                        
                        return null;