Imported Upstream version 4.2.1.36

Former-commit-id: f3008ca867fe7e4b7ae9b9a8844c0ad5798925a9
This commit is contained in:
Xamarin Public Jenkins
2015-09-24 06:06:07 -04:00
committed by Jo Shields
parent afe402035c
commit ea5caba957
172 changed files with 6570 additions and 11015 deletions

View File

@@ -36,7 +36,7 @@ namespace IKVM.Reflection.Writer
internal void Write(MetadataWriter mw)
{
int pos = mw.Position;
uint pos = mw.Position;
WriteImpl(mw);
Debug.Assert(mw.Position == pos + unalignedlength);
int align = Length - unalignedlength;
@@ -136,7 +136,7 @@ namespace IKVM.Reflection.Writer
{
if (table != null && table.RowCount > 0)
{
int pos = mw.Position;
uint pos = mw.Position;
table.Write(mw);
Debug.Assert(mw.Position - pos == table.GetLength(mw));
}

View File

@@ -48,9 +48,9 @@ namespace IKVM.Reflection.Writer
get { return moduleBuilder; }
}
internal int Position
internal uint Position
{
get { return (int)stream.Position; }
get { return (uint)stream.Position; }
}
internal void Write(ByteBuffer bb)

View File

@@ -313,7 +313,7 @@ namespace IKVM.Reflection.Writer
}
stream.Seek(text.PointerToRawData, SeekOrigin.Begin);
int guidHeapOffset;
uint guidHeapOffset;
code.Write(mw, sdata.VirtualAddress, out guidHeapOffset);
if (sdata.SizeOfRawData != 0)

View File

@@ -275,7 +275,7 @@ namespace IKVM.Reflection.Writer
}
}
internal void Write(MetadataWriter mw, uint sdataRVA, out int guidHeapOffset)
internal void Write(MetadataWriter mw, uint sdataRVA, out uint guidHeapOffset)
{
// Now that we're ready to start writing, we need to do some fix ups
moduleBuilder.TypeRef.Fixup(moduleBuilder);