Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -406,7 +406,7 @@ namespace IKVM.Reflection
this.declaringType = declaringType;
this.ns = ns;
this.name = name;
MarkEnumOrValueType(ns, name);
MarkKnownType(ns, name);
// HACK we need to handle the Windows Runtime projected types that change from ValueType to Class or v.v.
if (WindowsRuntimeProjection.IsProjectedValueType(ns, name, module))
@@ -454,14 +454,9 @@ namespace IKVM.Reflection
get { return declaringType; }
}
public override string __Name
internal override TypeName TypeName
{
get { return name; }
}
public override string __Namespace
{
get { return ns; }
get { return new TypeName(ns, name); }
}
public override string Name
@@ -648,7 +643,18 @@ namespace IKVM.Reflection
private readonly MemberInfo owner;
private readonly int index;
internal MissingTypeParameter(MemberInfo owner, int index)
internal MissingTypeParameter(Type owner, int index)
: this(owner, index, Signature.ELEMENT_TYPE_VAR)
{
}
internal MissingTypeParameter(MethodInfo owner, int index)
: this(owner, index, Signature.ELEMENT_TYPE_MVAR)
{
}
private MissingTypeParameter(MemberInfo owner, int index, byte sigElementType)
: base(sigElementType)
{
this.owner = owner;
this.index = index;