mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.0.0.172

Browse Source 
Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mcs/class/corlib/System/MonoCustomAttrs.cs
View File

@ -72,11 +72,11 @@ namespace System
internal static object[] GetPseudoCustomAttributes (ICustomAttributeProvider obj, Type attributeType) {
object[] pseudoAttrs = null;
/* FIXME: Add other types */
if (obj is MonoMethod monoMethod)
if (obj is RuntimeMethodInfo monoMethod)
pseudoAttrs = monoMethod.GetPseudoCustomAttributes ();
else if (obj is FieldInfo fieldInfo)
else if (obj is RuntimeFieldInfo fieldInfo)
pseudoAttrs = fieldInfo.GetPseudoCustomAttributes ();
else if (obj is MonoParameterInfo monoParamInfo)
else if (obj is RuntimeParameterInfo monoParamInfo)
pseudoAttrs = monoParamInfo.GetPseudoCustomAttributes ();
else if (obj is Type t)
pseudoAttrs = GetPseudoCustomAttributes (t);
@ -292,6 +292,9 @@ namespace System
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
[PreserveDependency(".ctor(System.Reflection.ConstructorInfo,System.Reflection.Assembly,System.IntPtr,System.UInt32)", "System.Reflection.CustomAttributeData")]
[PreserveDependency(".ctor(System.Reflection.MemberInfo,System.Object)", "System.Reflection.CustomAttributeNamedArgument")]
[PreserveDependency(".ctor(System.Type,System.Object)", "System.Reflection.CustomAttributeTypedArgument")]
static extern CustomAttributeData [] GetCustomAttributesDataInternal (ICustomAttributeProvider obj);
internal static IList<CustomAttributeData> GetCustomAttributesData (ICustomAttributeProvider obj, bool inherit = false)
@ -460,11 +463,11 @@ namespace System
CustomAttributeData[] pseudoAttrsData = null;
/* FIXME: Add other types */
if (obj is MonoMethod monoMethod)
if (obj is RuntimeMethodInfo monoMethod)
pseudoAttrsData = monoMethod.GetPseudoCustomAttributesData ();
else if (obj is FieldInfo fieldInfo)
else if (obj is RuntimeFieldInfo fieldInfo)
pseudoAttrsData = fieldInfo.GetPseudoCustomAttributesData ();
else if (obj is MonoParameterInfo monoParamInfo)
else if (obj is RuntimeParameterInfo monoParamInfo)
pseudoAttrsData = monoParamInfo.GetPseudoCustomAttributesData ();
else if (obj is Type t)
pseudoAttrsData = GetPseudoCustomAttributesData (t);
@ -547,7 +550,7 @@ namespace System
[MethodImplAttribute (MethodImplOptions.InternalCall)]
internal static extern bool IsDefinedInternal (ICustomAttributeProvider obj, Type AttributeType);
static PropertyInfo GetBasePropertyDefinition (MonoProperty property)
static PropertyInfo GetBasePropertyDefinition (RuntimePropertyInfo property)
{
MethodInfo method = property.GetGetMethod (true);
if (method == null || !method.IsVirtual)
@ -555,7 +558,7 @@ namespace System
if (method == null || !method.IsVirtual)
return null;
MethodInfo baseMethod = method.GetBaseMethod ();
MethodInfo baseMethod = ((RuntimeMethodInfo)method).GetBaseMethod ();
if (baseMethod != null && baseMethod != method) {
ParameterInfo[] parameters = property.GetIndexParameters ();
if (parameters != null && parameters.Length > 0) {
@ -572,7 +575,7 @@ namespace System
}
static EventInfo GetBaseEventDefinition (MonoEvent evt)
static EventInfo GetBaseEventDefinition (RuntimeEventInfo evt)
{
MethodInfo method = evt.GetAddMethod (true);
if (method == null || !method.IsVirtual)
@ -582,7 +585,7 @@ namespace System
if (method == null || !method.IsVirtual)
return null;
MethodInfo baseMethod = method.GetBaseMethod ();
MethodInfo baseMethod = ((RuntimeMethodInfo)method).GetBaseMethod ();
if (baseMethod != null && baseMethod != method) {
BindingFlags flags = method.IsPublic ? BindingFlags.Public : BindingFlags.NonPublic;
flags |= method.IsStatic ? BindingFlags.Static : BindingFlags.Instance;
@ -592,8 +595,8 @@ namespace System
return null;
}
// Handles Type, MonoProperty and MonoMethod.
// The runtime has also cases for MonoEvent, MonoField, Assembly and ParameterInfo,
// Handles Type, RuntimePropertyInfo and RuntimeMethodInfo.
// The runtime has also cases for RuntimeEventInfo, RuntimeFieldInfo, Assembly and ParameterInfo,
// but for those we return null here.
static ICustomAttributeProvider GetBase (ICustomAttributeProvider obj)
{
@ -604,23 +607,23 @@ namespace System
return ((Type) obj).BaseType;
MethodInfo method = null;
if (obj is MonoProperty)
return GetBasePropertyDefinition ((MonoProperty) obj);
else if (obj is MonoEvent)
return GetBaseEventDefinition ((MonoEvent)obj);
else if (obj is MonoMethod)
if (obj is RuntimePropertyInfo)
return GetBasePropertyDefinition ((RuntimePropertyInfo) obj);
else if (obj is RuntimeEventInfo)
return GetBaseEventDefinition ((RuntimeEventInfo)obj);
else if (obj is RuntimeMethodInfo)
method = (MethodInfo) obj;
/**
* ParameterInfo -> null
* Assembly -> null
* MonoEvent -> null
* MonoField -> null
* RuntimeEventInfo -> null
* RuntimeFieldInfo -> null
*/
if (method == null || !method.IsVirtual)
return null;
MethodInfo baseMethod = method.GetBaseMethod ();
MethodInfo baseMethod = ((RuntimeMethodInfo)method).GetBaseMethod ();
if (baseMethod == method)
return null;