Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -567,7 +567,7 @@ namespace IKVM.Reflection.Emit
{
this.pack = (short)packingSize;
this.size = typesize;
this.hasLayout = true;
this.hasLayout = pack != 0 || size != 0;
}
private void SetStructLayoutPseudoCustomAttribute(CustomAttributeBuilder customBuilder)

View File

@@ -758,7 +758,7 @@ namespace IKVM.Reflection
return null;
}
private Assembly DefaultResolver(string refname, bool throwOnError)
public Assembly DefaultResolver(string refname, bool throwOnError)
{
Assembly asm = GetDynamicAssembly(refname);
if (asm != null)