Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -431,8 +431,10 @@ namespace MonoTests.System.Reflection
Assert.IsFalse (lvi.IsPinned, "#3-1");
if (/* mcs */ lvi.LocalType == typeof (byte*) || /* csc */ lvi.LocalType == typeof (byte).MakeByRefType ()) {
foundPinnedBytePointer = true;
Assert.IsTrue (lvi.IsPinned, "#3-2");
// We have three locals. There's b the byte[], there's a byte* and there's a byte&.
// mcs emits a byte* for the latter type.
// We need to find one such pinned byte pointer. Therefore we're folding with logical or
foundPinnedBytePointer = foundPinnedBytePointer || lvi.IsPinned;
}
}
}