Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@ -144,6 +144,9 @@ namespace System.Reflection {
return MonoCustomAttrs.GetCustomAttributesData (target);
}
#if NETCORE
virtual
#endif
public Type AttributeType {
get { return ctorInfo.DeclaringType; }
}
@ -185,6 +188,9 @@ namespace System.Reflection {
public override bool Equals (object obj)
{
#if NETCORE
return obj == (object)this;
#else
CustomAttributeData other = obj as CustomAttributeData;
if (other == null || other.ctorInfo != ctorInfo ||
other.ctorArgs.Count != ctorArgs.Count ||
@ -204,10 +210,14 @@ namespace System.Reflection {
return false;
}
return true;
#endif
}
public override int GetHashCode ()
{
#if NETCORE
return base.GetHashCode ();
#else
int ret = ctorInfo == null ? 13 : (ctorInfo.GetHashCode () << 16);
// argument order-dependent
if (ctorArgs != null) {
@ -221,6 +231,7 @@ namespace System.Reflection {
ret += (namedArgs [i].GetHashCode () << 5);
}
return ret;
#endif
}
}