Imported Upstream version 5.10.0.161

Former-commit-id: b575702a94a9000090a94690529e68bcffe2cea2
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-03-08 08:45:10 +00:00
parent efb22d3209
commit bbe609c9ae
38 changed files with 44 additions and 45 deletions

View File

@@ -1 +1 @@
3dfddaef886efdcb16b0fb7a9666e20ecfc37c62
4d3eccac1a321ef2ee9d5042ffff0156a34a3026

View File

@@ -1 +1 @@
db18931c9022bc8170fe1397e334f168716084cb
1caacd293068a073ffa1b57f3fb05837600c23f2

View File

@@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.160";
public const string MonoVersion = "5.10.0.161";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@@ -373,8 +373,8 @@ namespace Mono.Profiler.Log {
case LogEventType.MonitorBacktrace:
ev = new MonitorEvent {
Event = StreamHeader.FormatVersion >= 14 ?
(LogMonitorEvent) _reader.ReadByte () :
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
(LogMonitorEvent) _reader.ReadByte () :
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
ObjectPointer = ReadObject (),
Backtrace = ReadBacktrace (extType == LogEventType.MonitorBacktrace),
};
@@ -476,9 +476,9 @@ namespace Mono.Profiler.Log {
Section = section,
SectionName = section == LogCounterSection.User ? _reader.ReadCString () : null,
CounterName = _reader.ReadCString (),
Type = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 (),
Unit = StreamHeader.FormatVersion < 15 ? (LogCounterUnit) _reader.ReadByte () : (LogCounterUnit) _reader.ReadULeb128 (),
Variance = StreamHeader.FormatVersion < 15 ? (LogCounterVariance) _reader.ReadByte () : (LogCounterVariance) _reader.ReadULeb128 (),
Type = (LogCounterType) _reader.ReadByte (),
Unit = (LogCounterUnit) _reader.ReadByte (),
Variance = (LogCounterVariance) _reader.ReadByte (),
Index = (long) _reader.ReadULeb128 (),
};
}
@@ -498,7 +498,7 @@ namespace Mono.Profiler.Log {
if (index == 0)
break;
var counterType = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 ();
var counterType = (LogCounterType) _reader.ReadByte ();
object value = null;

View File

@@ -1 +1 @@
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7

View File

@@ -1 +1 @@
efd89075bd285db5211e08ed43d8a1f277983c2a
934861dbe6711e129666fd5805326ab0073e3b42

View File

@@ -1 +1 @@
398a8f3785344006fc2a18c537335f051152c742
a83d98b1ac3bfabb08f9c54a39671da65356d43a

View File

@@ -1 +1 @@
e67714b89e0fd4da4a82040c8532f7d87780dcce
204c69b446f5268c93cb74d854e437eda0c544a8

View File

@@ -1 +1 @@
d229e5822be263f7985dd2fe47457be78943cd31
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460

View File

@@ -1 +1 @@
911ec1eda3f29662b7de938f41e2a56815290873
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61

View File

@@ -1 +1 @@
fe3eb98c4140e84f03eaf1395a30988958a8d221
3a88127e8bd195610a4a4dcfbcd9661b387f1c35

View File

@@ -1 +1 @@
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7

View File

@@ -1 +1 @@
efd89075bd285db5211e08ed43d8a1f277983c2a
934861dbe6711e129666fd5805326ab0073e3b42

View File

@@ -1 +1 @@
398a8f3785344006fc2a18c537335f051152c742
a83d98b1ac3bfabb08f9c54a39671da65356d43a

View File

@@ -1 +1 @@
e67714b89e0fd4da4a82040c8532f7d87780dcce
204c69b446f5268c93cb74d854e437eda0c544a8

View File

@@ -1 +1 @@
d229e5822be263f7985dd2fe47457be78943cd31
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460

View File

@@ -1 +1 @@
911ec1eda3f29662b7de938f41e2a56815290873
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61

View File

@@ -1 +1 @@
fe3eb98c4140e84f03eaf1395a30988958a8d221
3a88127e8bd195610a4a4dcfbcd9661b387f1c35

View File

@@ -1 +1 @@
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7

View File

@@ -1 +1 @@
efd89075bd285db5211e08ed43d8a1f277983c2a
934861dbe6711e129666fd5805326ab0073e3b42

Some files were not shown because too many files have changed in this diff Show More