2008-05-21 Marek Safar <marek.safar@gmail.com>

	A fix for bug #390372
	* nullable.cs: Set correct return type.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index a09ab4448e4c498569e69fb99445e4547b950815..6807aa91b08a569897349d132453d108aaaeeca9 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21  Marek Safar  <marek.safar@gmail.com>
+
+       A fix for bug #390372
+       * nullable.cs: Set correct return type.
+
 2008-05-21  Marek Safar  <marek.safar@gmail.com>
 
        A fix for bug #391062

diff --git a/mcs/mcs/nullable.cs b/mcs/mcs/nullable.cs
index 857b3b61ae602b85a6396503d47659a61b49607d..abb380817625b34d7f33c4b24667d4f41fcab572 100644 (file)
--- a/mcs/mcs/nullable.cs
+++ b/mcs/mcs/nullable.cs
@@ -1017,7 +1017,7 @@ namespace Mono.CSharp.Nullable
                                                return ReducedExpression.Create (lc != null ? right : left, this).Resolve (ec);
 
                                        right = Convert.ImplicitConversion (ec, right, ltype, loc);
-                                       type = right.Type;
+                                       type = left.Type;
                                        return this;
                                }
                        } else {