2008-11-28 Marek Safar <marek.safar@gmail.com>

	* literal.cs: Emit correctly explicit null to nullable cast.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 0f0d8c500d6843cc2e289ec98d46994faa3b1b56..607e5f9050866469a8f9cc2741a905d11fbbea2e 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-28  Marek Safar  <marek.safar@gmail.com>
+
+       * literal.cs: Emit correctly explicit null to nullable cast.
+
 2008-11-28  Marek Safar  <marek.safar@gmail.com>
 
        * ecore.cs, generics.cs: Fixed crash when type arguments fail to

diff --git a/mcs/mcs/literal.cs b/mcs/mcs/literal.cs
index 73327bea299e8ed1d6da993a55e7f656f2a0816d..a22e948ba699a69d4d69e17cb90cdc8c4f44cd21 100644 (file)
--- a/mcs/mcs/literal.cs
+++ b/mcs/mcs/literal.cs
@@ -94,7 +94,7 @@ namespace Mono.CSharp {
                                return new EmptyConstantCast (this, targetType);
 
                        if (TypeManager.IsNullableType (targetType))
-                               return new EmptyConstantCast (this, targetType);
+                               return Nullable.LiftedNull.Create (targetType, loc);
 
                        return null;
                }