mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 48e2b1548ce55a9f382201065d91a9dc2c93f411
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-01-19 16:51:48 +00:00
commit d54f9f804d
44 changed files with 137 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
500f87548b7d7fc19932796f10f77b860532830c
3f09b601878b3b0733df5bf60b63d9f073a2ddd9

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
c37b093c9632205f4c8961496754329b55b87cc6
5c436fa207f4194311d1484a2af27b92af78515a

2
mcs/build/common/Consts.cs
View File

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

35
mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs
View File

@ -249,12 +249,22 @@ namespace System.Net.Sockets
internal void FinishConnectByNameSyncFailure (Exception exception, int bytesTransferred, SocketFlags flags)
{
throw new NotImplementedException ();
SetResults (exception, bytesTransferred, flags);
if (current_socket != null)
current_socket.is_connected = false;
Complete ();
}
internal void FinishOperationAsyncFailure (Exception exception, int bytesTransferred, SocketFlags flags)
{
throw new NotImplementedException ();
SetResults (exception, bytesTransferred, flags);
if (current_socket != null)
current_socket.is_connected = false;
Complete ();
}
internal void FinishWrapperConnectSuccess (Socket connectSocket, int bytesTransferred, SocketFlags flags)
@ -268,8 +278,29 @@ namespace System.Net.Sockets
internal void SetResults (SocketError socketError, int bytesTransferred, SocketFlags flags)
{
SocketError = socketError;
ConnectByNameError = null;
BytesTransferred = bytesTransferred;
SocketFlags = flags;
}
internal void SetResults (Exception exception, int bytesTransferred, SocketFlags flags)
{
ConnectByNameError = exception;
BytesTransferred = bytesTransferred;
SocketFlags = flags;
if (exception == null)
{
SocketError = SocketError.Success;
}
else
{
var socketException = exception as SocketException;
if (socketException != null)
SocketError = socketException.SocketErrorCode;
else
SocketError = SocketError.SocketError;
}
}
}
}

75
mcs/class/System/System.Net/WebConnection.cs
View File

@ -901,13 +901,9 @@ namespace System.Net
internal int EndRead (HttpWebRequest request, IAsyncResult result)
{
Stream s = null;
Exception exception = null;
lock (this) {
if (request.Aborted)
throw new WebException ("Request aborted", WebExceptionStatus.RequestCanceled);
if (Data.request != request)
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
if (nstream == null)
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
s = nstream;
}
@ -915,19 +911,35 @@ namespace System.Net
bool done = false;
WebAsyncResult wr = null;
IAsyncResult nsAsync = ((WebAsyncResult) result).InnerAsyncResult;
if (chunkedRead && (nsAsync is WebAsyncResult)) {
wr = (WebAsyncResult) nsAsync;
IAsyncResult inner = wr.InnerAsyncResult;
if (inner != null && !(inner is WebAsyncResult)) {
nbytes = s.EndRead (inner);
try {
if (chunkedRead && (nsAsync is WebAsyncResult)) {
wr = (WebAsyncResult) nsAsync;
IAsyncResult inner = wr.InnerAsyncResult;
if (inner != null && !(inner is WebAsyncResult)) {
nbytes = s.EndRead (inner);
done = nbytes == 0;
}
} else if (!(nsAsync is WebAsyncResult)) {
nbytes = s.EndRead (nsAsync);
wr = (WebAsyncResult) result;
done = nbytes == 0;
}
} else if (!(nsAsync is WebAsyncResult)) {
nbytes = s.EndRead (nsAsync);
wr = (WebAsyncResult) result;
done = nbytes == 0;
} catch (Exception exc) {
exception = exc;
}
lock (this) {
if (request.Aborted)
throw new WebException ("Request aborted", WebExceptionStatus.RequestCanceled);
if (Data.request != request)
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
if (nstream == null)
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
}
if (exception != null)
throw exception;
if (chunkedRead) {
try {
chunkStream.WriteAndReadBack (wr.Buffer, wr.Offset, wr.Size, ref nbytes);
@ -1029,6 +1041,24 @@ namespace System.Net
internal bool EndWrite (HttpWebRequest request, bool throwOnError, IAsyncResult result)
{
Stream s = null;
WebExceptionStatus newStatus = status;
bool complete;
Exception exception = null;
lock (this) {
s = nstream;
}
try {
s.EndWrite (result);
complete = true;
} catch (Exception exc) {
newStatus = WebExceptionStatus.SendFailure;
if (throwOnError && exc.InnerException != null)
exception = exc.InnerException;
complete = false;
}
lock (this) {
if (status == WebExceptionStatus.RequestCanceled)
return true;
@ -1036,18 +1066,12 @@ namespace System.Net
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
if (nstream == null)
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
s = nstream;
}
try {
s.EndWrite (result);
return true;
} catch (Exception exc) {
status = WebExceptionStatus.SendFailure;
if (throwOnError && exc.InnerException != null)
throw exc.InnerException;
return false;
}
status = newStatus;
if (exception != null)
throw exception;
return complete;
}
internal int Read (HttpWebRequest request, byte [] buffer, int offset, int size)
@ -1132,7 +1156,6 @@ namespace System.Net
try {
nstream.Close ();
} catch {}
nstream = null;
}
if (socket != null) {

2
mcs/class/lib/monolite-darwin/1050800000/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
60a68c5ab5b1c095b8a1a23761f45ff75b1bf9db
9753fe2a01b47a61fcf858b148ffa69499f413bb

2
mcs/class/lib/monolite-darwin/1050800000/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
4d9a8c11d37509f6374d96c87a8faabbd90eded0
f69c8868f2606fc0112f30eaa287cf18da4a26eb

2
mcs/class/lib/monolite-darwin/1050800000/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
c2e760a7bb7d670d2858a4a763c68a6a144fe3d5
da9c8e6d2dc761d4a7b58c941cae838334c936b0

2
mcs/class/lib/monolite-darwin/1050800000/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
5faa2a5296ce8e5717873b82b8cc94f7f4a0bf77
f7a3d40197da007b65d00a3838880b0e93ad446e

2
mcs/class/lib/monolite-darwin/1050800000/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
db80c37286faf91a62bd4868e0a57bbff4bbf5dd
96f658d24a4c74352185a04ca4fc0b7c4db159c5

2
mcs/class/lib/monolite-darwin/1050800000/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
3674314ec608873638973618f84c0c09564439ef
d799b0595e090cc5038305e06e8f0a6a0738170d

2
mcs/class/lib/monolite-darwin/1050800000/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
ff2d583abecb15a4159513f02909e9644b50845a
67b8da2abab1db07ce6cda1b9301b2d1ceecfe8d

2
mcs/class/lib/monolite-darwin/1050800000/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
97d5ef8a4d495313de00e7f5affb9eec789f33f8
bb723a17df2c15cb5cc050b53b42ec90ee3871c8

2
mcs/class/lib/monolite-linux/1050800000/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
44d62229b5c4ec1cc50052f9edac17abc069be87
70b5308cc1e2048e1d51e5405027f3b16c33af42

2
mcs/class/lib/monolite-linux/1050800000/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
3231f9c9fb037e65dc5b487d8e045e6839fdb40c
372afc44250bcb44e95bb107ac56a683cf875fee

2
mcs/class/lib/monolite-linux/1050800000/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
c699d7350bbed35bd074ad7ec966882d4a8222a5
f90c9b2987aa1cdb7c2f207263835a0f1021e8ee

2
mcs/class/lib/monolite-linux/1050800000/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
fe41a9a3652738c39a0c71f9799ddb76564dacca
3622224821062d80bfa27d4482a1b29ade3869df

2
mcs/class/lib/monolite-linux/1050800000/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
1d4d16c4202a3dd4e1bd6aaafbf074847bedebc5
72785d68c86916ee09aee3f2f914c05d20402a99

2
mcs/class/lib/monolite-linux/1050800000/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
0584e6f11a61379d04a37167d0cad693af971a1b
475f042dea75386f42540fb89cf29eb8ad9581c7

2
mcs/class/lib/monolite-linux/1050800000/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
37b5f7e483f84610a3d92bf44c08795ec777f872
74996d0d8a8d8a4fd4c4a2a5f9778855f6b26e8a

2
mcs/class/lib/monolite-linux/1050800000/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
840349a1da3cab83ed2416e0fe3cf80aa6fc9243
22d63b5a8b78311bdd2cee5266fa392b17282991

2
mcs/class/lib/monolite-win32/1050800000/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
e3b737b021aeb062d04a0ead6c7dd16c06983a17
33efd1a3ba835261b86adfdfd9f8a89a0ec1c3b2

2
mcs/class/lib/monolite-win32/1050800000/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
9307bdb8a4bd3c7dc23adbb5bae334c5c0043388
ab3f028c7d9666cc3f3d67f8865d3b4f4fe5fac4

2
mcs/class/lib/monolite-win32/1050800000/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a63779d1104e813ef407fb99a6fdcb40a78c00a5
0149ffdfdcb41c73404e1f2be0847ce95eb89b44

2
mcs/class/lib/monolite-win32/1050800000/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
9a07ce5baaefc0d4c983b00300033fc0a72c4fdf
0088a276e832eceff6748195ab0e316fc1ab889f

2
mcs/class/lib/monolite-win32/1050800000/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
b6411a56f6d6143a03f07e9a4bcf47cff8ea1fb1
51dc425388b6454bbc4d9f42836fb9b902fbfc7a

2
mcs/class/lib/monolite-win32/1050800000/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
8263e4b9b49459605da0d90c211cbd347e8a704e
ccb22b398b5d3ea2772f5f352ac58196b3432c0b

2
mcs/class/lib/monolite-win32/1050800000/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
0242bb183e348d3a4093f10229703bf152b00efd
965fe57ca94742e460e39471b8546ebef1715e53

2
mcs/class/lib/monolite-win32/1050800000/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
bcd19f07e37fdf9b2936e2f211cf05d2948682fc
4cea8e151e564d933ba31d215c40941ddeb03e1a

2
mono/metadata/assembly.c.REMOVED.git-id
View File

@ -1 +1 @@
684a401c95919b0ccce2a70159eb022884260ffb
9909619e72d1815ecedc94e3b0985cf86809042b

6
mono/mini/alias-analysis.c
View File

@ -93,7 +93,11 @@ lower_store (MonoCompile *cfg, MonoInst *store, MonoInst *ldaddr)
if (cfg->verbose_level > 2) { printf ("mem2reg replacing: "); mono_print_ins (store); }
}
store->opcode = mono_type_to_regmove (cfg, type);
int coerce_op = mono_type_to_stloc_coerce (type);
if (coerce_op)
store->opcode = coerce_op;
else
store->opcode = mono_type_to_regmove (cfg, type);
type_to_eval_stack_type (cfg, type, store);
store->dreg = var->dreg;
InterlockedIncrement (&mono_jit_stats.stores_eliminated);

2
mono/mini/method-to-ir.c.REMOVED.git-id
View File

@ -1 +1 @@
d30f0570533a137038bda04e9797e5cb0fe957d5
c0d4e7e7d80e54fc1c2925c03cedefd63c3f299c

2
mono/mini/mini.h.REMOVED.git-id
View File

@ -1 +1 @@
947c3ee509153002fd5182a31b5280079a914b0d
4523044e136a78404acc6f44eb460b59889b1385

13
mono/mini/objects.cs
View File

@ -1829,6 +1829,19 @@ ncells ) {
return 0;
}
static void decode (out sbyte v) {
byte tmp = 134;
v = (sbyte)tmp;
}
// gh #6414
public static int test_0_alias_analysis_sign_extend () {
sbyte t;
decode (out t);
return t == -122 ? 0 : 1;
}
}
#if __MOBILE__

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/1359c52"
#define FULL_VERSION "explicit/9aa7857"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
782b3dccbf3045cfc119b732132c40a785cd93ee
ffb12d6077f6cc17d935a6559894312cbd07b492

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
7ab59a2e9dfda7ad5ebdf385a4ffa9022275a04e
d4a0a156433b88d025dca397064c4de8ee6f5351

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
3c588250aa700404a39e59b172ecd00ab4e850a8
59117919a8f400f00f22bcdfda0d3d05e19309ef

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.8.0.103\n"
"Project-Id-Version: mono 5.8.0.108\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-01-17 20:04+0000\n"
"POT-Creation-Date: 2018-01-19 15:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
f3db87beb1598a50cbd128db99ab1c63b3a9e244
7797bc88c9747c64a5f266c9834ec0a959c9aeeb