Fix #73038.

[mono.git] / mcs / mcs / constant.cs

diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
old mode 100755 (executable)
new mode 100644 (file)
index 103572b..5bf0335
--- a/mcs/mcs/constant.cs
+++ b/mcs/mcs/constant.cs
@@ -116,6 +116,21 @@ namespace Mono.CSharp {
 
                        return c;
                }
+
+               public DecimalConstant ToDecimal (Location loc)
+               {
+                       DecimalConstant c = ConvertToDecimal ();
+
+                       if (c == null)
+                               Convert.Error_CannotConvertType (loc, Type, TypeManager.decimal_type);
+
+                       return c;
+               }
+
+               public virtual DecimalConstant ConvertToDecimal ()
+               {
+                       return null;
+               }
                
                public virtual DoubleConstant ConvertToDouble ()
                {
@@ -147,6 +162,10 @@ namespace Mono.CSharp {
                        return null;
                }
                
+               public abstract bool IsDefaultValue {
+                       get;
+               }
+
                public abstract bool IsNegative {
                        get;
                }
@@ -190,6 +209,12 @@ namespace Mono.CSharp {
                                ec.ig.Emit (OpCodes.Ldc_I4_0);
                }
        
+               public override bool IsDefaultValue {
+                       get {
+                               return !Value;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;
@@ -256,6 +281,12 @@ namespace Mono.CSharp {
                        return new IntConstant (Value);
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;
@@ -351,6 +382,12 @@ namespace Mono.CSharp {
                        return new IntConstant (Value);
                }
                
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;
@@ -420,6 +457,12 @@ namespace Mono.CSharp {
                        return new IntConstant (Value);
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return Value < 0;
@@ -485,6 +528,12 @@ namespace Mono.CSharp {
                {
                        return new IntConstant (Value);
                }
+
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
                
                public override bool IsZeroInteger {
                        get { return Value == 0; }
@@ -552,6 +601,12 @@ namespace Mono.CSharp {
                        return new IntConstant (Value);
                }
        
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;
@@ -640,6 +695,11 @@ namespace Mono.CSharp {
                        return Value;
                }
 
+               public override DecimalConstant ConvertToDecimal()
+               {
+                       return new DecimalConstant (Value);
+               }
+
                public override DoubleConstant ConvertToDouble ()
                {
                        return new DoubleConstant (Value);
@@ -675,6 +735,12 @@ namespace Mono.CSharp {
                {
                        return this;
                }
+
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
                
                public override bool IsNegative {
                        get {
@@ -742,6 +808,12 @@ namespace Mono.CSharp {
                        return null;
                }
                
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;
@@ -823,6 +895,12 @@ namespace Mono.CSharp {
                        return null;
                }
                
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return Value < 0;
@@ -891,6 +969,12 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;
@@ -952,6 +1036,12 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return Value < 0;
@@ -1014,6 +1104,12 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return Value < 0;
@@ -1043,15 +1139,24 @@ namespace Mono.CSharp {
 
                public override void Emit (EmitContext ec)
                {
+                       ILGenerator ig = ec.ig;
+
                        int [] words = Decimal.GetBits (Value);
+                       int power = (words [3] >> 16) & 0xff;
+
+                       if (power == 0 && Value <= int.MaxValue && Value >= int.MinValue)
+                       {
+                               IntConstant.EmitInt (ig, (int)Value);
+                               ig.Emit (OpCodes.Newobj, TypeManager.void_decimal_ctor_int_arg);
+                               return;
+                       }
+
                        
                        //
                        // FIXME: we could optimize this, and call a better 
                        // constructor
                        //
 
-                       ILGenerator ig = ec.ig;
-                       
                        IntConstant.EmitInt (ig, words [0]);
                        IntConstant.EmitInt (ig, words [1]);
                        IntConstant.EmitInt (ig, words [2]);
@@ -1060,11 +1165,17 @@ namespace Mono.CSharp {
                        IntConstant.EmitInt (ig, words [3] >> 31);
 
                        // power
-                       IntConstant.EmitInt (ig, (words [3] >> 16) & 0xff);
+                       IntConstant.EmitInt (ig, power);
 
                        ig.Emit (OpCodes.Newobj, TypeManager.void_decimal_ctor_five_args);
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == 0;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return Value < 0;
@@ -1101,6 +1212,12 @@ namespace Mono.CSharp {
                                ec.ig.Emit (OpCodes.Ldstr, Value);
                }
 
+               public override bool IsDefaultValue {
+                       get {
+                               return Value == null;
+                       }
+               }
+
                public override bool IsNegative {
                        get {
                                return false;