A type parameter can never be optional.

[mono.git] / mcs / gmcs / convert.cs

diff --git a/mcs/gmcs/convert.cs b/mcs/gmcs/convert.cs
index ffd0334f12a4c468774797be7613a6a253facd4e..e00336fbe67f7767b27ff4169eb74495b9a1bc00 100644 (file)
--- a/mcs/gmcs/convert.cs
+++ b/mcs/gmcs/convert.cs
@@ -894,6 +894,8 @@ namespace Mono.CSharp {
                        return UserDefinedConversion (ec, source, target, loc, true);
                }
 
+               static DoubleHash explicit_conv = new DoubleHash (100);
+               static DoubleHash implicit_conv = new DoubleHash (100);
                /// <summary>
                ///   Computes the MethodGroup for the user-defined conversion
                ///   operators from source_type to target_type.  `look_for_explicit'
@@ -911,6 +913,9 @@ namespace Mono.CSharp {
                        op_name = "op_Implicit";
 
                        MethodGroupExpr union3;
+                       object r;
+                       if ((look_for_explicit ? explicit_conv : implicit_conv).Lookup (source_type, target_type, out r))
+                               return (MethodGroupExpr) r;
 
                        mg1 = Expression.MethodLookup (ec, source_type, op_name, loc);
                        if (source_type.BaseType != null)
@@ -960,7 +965,9 @@ namespace Mono.CSharp {
                                union4 = Invocation.MakeUnionSet (union5, union6, loc);
                        }
                        
-                       return Invocation.MakeUnionSet (union3, union4, loc);
+                       MethodGroupExpr ret = Invocation.MakeUnionSet (union3, union4, loc);
+                       (look_for_explicit ? explicit_conv : implicit_conv).Insert (source_type, target_type, ret);
+                       return ret;
                }
                
                /// <summary>