2009-01-16 Marek Safar <marek.safar@gmail.com>

	* nullable.cs (LiftedBinaryOperator): Check for all possible null
	expressions.

svn path=/trunk/mcs/; revision=123624

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index a1dd59ca872ffc56f6d92e53d153b7eb411c3926..f6ad5f1c528d0816034c978165166ce2e2cdb21c 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-16  Marek Safar  <marek.safar@gmail.com>
+
+       * nullable.cs (LiftedBinaryOperator): Check for all possible null
+       expressions.
+
 2009-01-15  Marek Safar  <marek.safar@gmail.com>
 
        A fix for bug #466634

diff --git a/mcs/mcs/nullable.cs b/mcs/mcs/nullable.cs
index b862f58c228f4cdb265cf8be838f5786da906e84..1fa708dff18b70c1d642e4044061f901e0fa4d5f 100644 (file)
--- a/mcs/mcs/nullable.cs
+++ b/mcs/mcs/nullable.cs
@@ -626,13 +626,13 @@ 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 is NullLiteral) {
+                       if (left_orig.IsNull) {
                                left = right;
                                left_null_lifted = true;
                                type = TypeManager.bool_type;
                        }
 
-                       if (right is NullLiteral) {
+                       if (right_orig.IsNull) {
                                right = left;
                                right_null_lifted = true;
                                type = TypeManager.bool_type;