[660553] Fixed delegate name hiding.

[mono.git] / mcs / mcs / dynamic.cs

diff --git a/mcs/mcs/dynamic.cs b/mcs/mcs/dynamic.cs
index 42e68fa385406bb0245eb77e6700c2ae56e4e721..2919672dec13386b572c806202a6c7acd19df915 100644 (file)
--- a/mcs/mcs/dynamic.cs
+++ b/mcs/mcs/dynamic.cs
@@ -137,17 +137,22 @@ namespace Mono.CSharp
 
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
-#if NET_4_0            
-                       if (type.IsStruct && !obj.Expression.Type.IsValueType)
-                               return SLE.Expression.Unbox (obj.Expression, type.GetMetaInfo ());
+#if STATIC
+                       return base.MakeExpression (ctx);
+#else
 
-                       if (obj.Expression.NodeType == SLE.ExpressionType.Parameter) {
-                               if (((SLE.ParameterExpression) obj.Expression).IsByRef)
-                                       return obj.Expression;
-                       }
-#endif
+       #if NET_4_0             
+                               if (type.IsStruct && !obj.Expression.Type.IsValueType)
+                                       return SLE.Expression.Unbox (obj.Expression, type.GetMetaInfo ());
+
+                               if (obj.Expression.NodeType == SLE.ExpressionType.Parameter) {
+                                       if (((SLE.ParameterExpression) obj.Expression).IsByRef)
+                                               return obj.Expression;
+                               }
+       #endif
 
-                       return SLE.Expression.Convert (obj.Expression, type.GetMetaInfo ());
+                               return SLE.Expression.Convert (obj.Expression, type.GetMetaInfo ());
+#endif
                }
        }
 
@@ -174,7 +179,11 @@ namespace Mono.CSharp
 #if NET_4_0
                public override SLE.Expression MakeExpression (BuilderContext ctx)
                {
+#if STATIC
+                       return base.MakeExpression (ctx);
+#else
                        return SLE.Expression.Block (expr.MakeExpression (ctx), SLE.Expression.Default (type.GetMetaInfo ()));
+#endif
                }
 #endif
        }