From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 24 Feb 2009 16:57:53 +0000 (-0000)
Subject: 2009-02-24  Marek Safar  <marek.safar@gmail.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=f2832f7cbac19040f19704bcca2e943f252c3099;p=mono.git

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 39efc3e208d..3fa3586e176 100644
--- 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 d8fd021771b..17e1faeecd4 100644
--- 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);