2009-02-24 Marek Safar <marek.safar@gmail.com>

	A fix for bug #476295
	* convert.cs: Avoid wrapping implicitly convertible reference type.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 39efc3e208d9c08493852bb4cb7822285624bcce..3fa3586e176277389d5b873c2ddcfbcca66e4c08 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-24  Marek Safar  <marek.safar@gmail.com>
+
+       A fix for bug #476295
+       * convert.cs: Avoid wrapping implicitly convertible reference type.
+
 2009-02-23  Marek Safar  <marek.safar@gmail.com>
 
        * iterators.cs: Create MemberName correctly.

diff --git a/mcs/mcs/convert.cs b/mcs/mcs/convert.cs
index d8fd021771b22d6f18afeeec039e169c2f7d0cc1..17e1faeecd4ae9ed51ab5401faa3169d82b77cac 100644 (file)
--- a/mcs/mcs/convert.cs
+++ b/mcs/mcs/convert.cs
@@ -264,9 +264,9 @@ namespace Mono.CSharp {
 
                        if (ImplicitReferenceConversionExists (expr, target_type)) {
                                // 
-                               // Reduce implicit reference conversion to object
+                               // Avoid wrapping implicitly convertible reference type
                                //
-                               if (!explicit_cast && target_type == TypeManager.object_type)
+                               if (!explicit_cast)
                                        return expr;
 
                                return EmptyCast.Create (expr, target_type);