Adjust implementation of HasSameMetadataDefinitionAs to be resilient …

…to failures of Expression.Compile. [tfs-changeset: 1461633]
syediddi · Apr 28, 2015 · 27367ab · 27367ab
1 parent 7a6d256
commit 27367ab
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderExtensions.cs b/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/RuntimeBinderExtensions.cs
@@ -305,13 +305,22 @@ public static bool HasSameMetadataDefinitionAs(this MemberInfo mi1, MemberInfo m
                 else
                 {
                     var parameter = Expression.Parameter(memberInfo);
-                    s_GetMetadataToken = Expression.Lambda<Func<MemberInfo, int>>(Expression.Property(parameter, property), new[] { parameter }).Compile();
+                    try
+                    {
+                        s_GetMetadataToken = Expression.Lambda<Func<MemberInfo, int>>(Expression.Property(parameter, property), new[] { parameter }).Compile();
+                    }
+                    catch
+                    {
+                        // Platform might not allow access to the property
+                        s_GetMetadataToken = null;
+                    }
                 }
             }
 
-            if ((object)s_GetMetadataToken != null)
+            var getMetadataToken = s_GetMetadataToken;
+            if ((object)getMetadataToken != null)
             {
-                return s_GetMetadataToken(mi1) == s_GetMetadataToken(mi2);
+                return getMetadataToken(mi1) == getMetadataToken(mi2);
             }
 
             return mi1.IsEquivalentTo(mi2);