Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -11,7 +11,10 @@ class PointerArithmeticTest
} catch (System.OverflowException) {}
try {
return CheckSub((short*)(-1), int.MaxValue);
if (IntPtr.Size <= 4)
return CheckSub((short*)(-1), int.MaxValue);
else
return CheckSub((short*)(-1), long.MaxValue);
} catch (System.OverflowException) {}
CheckSub2((short*)(-1), int.MaxValue);
@@ -44,6 +47,14 @@ class PointerArithmeticTest
return 102;
}
unsafe static int CheckSub(short* ptr, long offset)
{
if (checked(ptr - offset < ptr))
return 2;
return 102;
}
unsafe static int CheckSub2(short* ptr, int offset)
{
short* b = ptr + offset;