Merge branch 'upstream'

Former-commit-id: 2e634f437aefbf0857aebfc92c93edbc3b5d9403
2019-07-26 20:20:50 +00:00 · 2019-07-26 20:20:50 +00:00 · 44963f852c
commit 44963f852c
parent b9dd74e00e ef583813eb
2712 changed files with 74169 additions and 40587 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -19,11 +19,17 @@ build_with_msvc =
 build_without_msvc = msvc
 endif

+if ENABLE_NETCORE
+update_submodules = 
+else
+update_submodules = update_submodules
+endif
+
 SUBDIRS = $(build_with_msvc) mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) $(build_without_msvc) $(docs_dir) acceptance-tests
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests
+DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests netcore

-all: update_submodules
+all: $(update_submodules)

 update_submodules:
 	@cd $(srcdir) && scripts/update_submodules.sh
--- a/Makefile.in
+++ b/Makefile.in
@ -241,6 +241,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -371,8 +373,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@ -489,9 +493,11 @@ MONOTOUCH_SUBDIRS = $(libgc_dir) mono
@ENABLE_MSVC_TRUE@build_with_msvc = msvc
@ENABLE_MSVC_FALSE@build_without_msvc = msvc
@ENABLE_MSVC_TRUE@build_without_msvc = 
+@ENABLE_NETCORE_FALSE@update_submodules = update_submodules
+@ENABLE_NETCORE_TRUE@update_submodules = 
 SUBDIRS = $(build_with_msvc) mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) $(build_without_msvc) $(docs_dir) acceptance-tests
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests
+DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests netcore
 EXTRA_DIST = \
 	README.md 		\
 	LICENSE 		\
@ -1009,7 +1015,7 @@ uninstall-am:
 .PRECIOUS: Makefile


-all: update_submodules
+all: $(update_submodules)

 update_submodules:
 	@cd $(srcdir) && scripts/update_submodules.sh
--- a/README.md
+++ b/README.md
@ -306,6 +306,9 @@ faster under the Xen virtualization system.

 * `--with-large-heap=yes,no` - Enable support for GC heaps larger than 3GB.

+  * This only applies only to the Boehm garbage collector, the SGen garbage
+collector does not use this configuration option.
+
  * This defaults to `no`.

 * `--enable-small-config=yes,no` - Enable some tweaks to reduce memory usage
--- a/acceptance-tests/Makefile.in.REMOVED.git-id
+++ b/acceptance-tests/Makefile.in.REMOVED.git-id
@ -1 +1 @@
-82211f291c887f62ce30cc2305884e307855ecd8
+f52b3c52f452b58b3574d18627f00353ac002e09
--- a/acceptance-tests/SUBMODULES.json
+++ b/acceptance-tests/SUBMODULES.json
@ -10,7 +10,7 @@
  {
    "name": "coreclr", 
    "url": "git://github.com/mono/coreclr.git", 
-    "rev": "1e8d7a94155a04a6556a7ae9ef8dc5841b3ab206",
+    "rev": "90f7060935732bb624e1f325d23f63072433725f",
    "remote-branch": "origin/mono", 
    "branch": "mono", 
    "directory": "coreclr"
--- a/config.h.in
+++ b/config.h.in
@ -342,6 +342,10 @@
   0 if you don't. */
 #undef HAVE_DECL_INTERLOCKEDINCREMENT64

+/* Define to 1 if you have the declaration of `pthread_mutexattr_setprotocol',
+   and to 0 if you don't. */
+#undef HAVE_DECL_PTHREAD_MUTEXATTR_SETPROTOCOL
+
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
   don't. */
 #undef HAVE_DECL_STRERROR_R
@ -1368,6 +1372,9 @@
 /* Host Platform is Darwin */
 #undef HOST_DARWIN

+/* Targeting the Fuchsia platform */
+#undef HOST_FUCHSIA
+
 /* ... */
 #undef HOST_MIPS

--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-5cddb32e13af11623b2e96384461a2595fae2237
+a133e8adbcdbb6319c3fa3ba0de894b7140e121e
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-c29bc5931daf65abd230d8b4ff4469ff74250676
+366d1ab3d533c3643d80c6c17bdd9e283cb44c07
--- a/data/Makefile.in
+++ b/data/Makefile.in
@ -265,6 +265,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -395,8 +397,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/data/lldb/monobt.py
+++ b/data/lldb/monobt.py
@ -20,7 +20,7 @@ def print_frames(thread, num_frames, current_thread):
                ipoffset = frame.EvaluateExpression('ip').GetValueAsUnsigned()
                insn = ''
                if ipoffset != 0:
-                    ipoffset -= frame.EvaluateExpression('rtm->code').GetValueAsUnsigned()
+                    ipoffset -= frame.EvaluateExpression('imethod->code').GetValueAsUnsigned()
                    insn = "\"" + frame.EvaluateExpression('mono_interp_opname [*ip]').summary[1:-1] + "\""
                var = '%s::%s @ %d %s || %s' % (klassname, methodname, ipoffset, insn, frame)
            except Exception as e:
--- a/data/net_2_0/Browsers/Makefile.in
+++ b/data/net_2_0/Browsers/Makefile.in
@ -186,6 +186,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -316,8 +318,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/data/net_2_0/Makefile.in
+++ b/data/net_2_0/Makefile.in
@ -246,6 +246,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -376,8 +378,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/data/net_4_0/Browsers/Makefile.in
+++ b/data/net_4_0/Browsers/Makefile.in
@ -186,6 +186,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -316,8 +318,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/data/net_4_0/Makefile.in
+++ b/data/net_4_0/Makefile.in
@ -246,6 +246,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -376,8 +378,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/data/net_4_5/Browsers/Makefile.in
+++ b/data/net_4_5/Browsers/Makefile.in
@ -186,6 +186,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -316,8 +318,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/data/net_4_5/Makefile.in
+++ b/data/net_4_5/Makefile.in
@ -246,6 +246,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -376,8 +378,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@ -187,6 +187,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CMAKE = @CMAKE@
+COREARCH = @COREARCH@
+CORETARGETS = @CORETARGETS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CSC = @CSC@
@ -317,8 +319,10 @@ PATHSEP = @PATHSEP@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PIDTYPE = @PIDTYPE@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_AOT_PREFIX = @PLATFORM_AOT_PREFIX@
 PLATFORM_AOT_SUFFIX = @PLATFORM_AOT_SUFFIX@
 RANLIB = @RANLIB@
+RID = @RID@
 SEARCHSEP = @SEARCHSEP@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
--- a/docs/deploy/mono-api-class.html
+++ b/docs/deploy/mono-api-class.html
@ -1149,8 +1149,7 @@ mono_class_is_enum (MonoClass *klass)

            <div class="mapi-declaration mapi-section">Syntax</div>
            <div class="mapi-prototype">gboolean
-mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc, 
-			   gboolean check_interfaces)
+mono_class_is_subclass_of (MonoClass *klass, MonoClass *klassc, gboolean check_interfaces)

 </div>
            <p />
--- a/docs/deploy/mono-api-internal.html
+++ b/docs/deploy/mono-api-internal.html
@ -231,8 +231,7 @@
            <div class="mapi-ptr"></div>

            <div class="mapi-declaration mapi-section">Syntax</div>
-            <div class="mapi-prototype">gunichar2*
-mono_unicode_from_external (const gchar *in, gsize *bytes)
+            <div class="mapi-prototype">gunichar2*mono_unicode_from_external (const gchar *in, gsize *bytes)

 </div>
            <p />
@ -491,14 +490,14 @@ mono_marshal_get_delegate_invoke (MonoMethod *method, MonoDelegate *del)

            <div class="mapi-declaration mapi-section">Syntax</div>
            <div class="mapi-prototype">MonoMethod*
-mono_marshal_get_icall_wrapper (MonoMethodSignature *sig, const char *name, gconstpointer func, gboolean check_exceptions)
+mono_marshal_get_icall_wrapper (MonoJitICallInfo *callinfo, gboolean check_exceptions)

 </div>
            <p />
             <div class="mapi-section">Description</div>
             <div>
- Generates IL code for the icall wrapper. The generated method
- calls the unmanaged code in <i>func</i>.</div>
+ Generates IL code for the JIT icall wrapper. The generated method
+ calls the unmanaged code in <i>callinfo</i>-&gt;func.</div>
        </div><!--mapi-description -->
    </div><!--height container -->
 </div> <!-- class=mapi  -->
--- a/docs/deploy/mono-api-methods.html
+++ b/docs/deploy/mono-api-methods.html
@ -1026,7 +1026,7 @@ mono_method_body_get_object (MonoDomain *domain, MonoMethod *method)
            <p />
            <div class="mapi-section">Parameters</div>
            <table class="mapi-parameters"><tbody><tr><td><i>domain</i></td><td> an app domain</td></tr><tr><td><i>method</i></td><td> a method</td></tr></tbody></table>             <div class="mapi-section">Return value</div>
-             <div>	 A <code>System.Reflection.MethodBody</code> object representing the method <i>method</i>.
+             <div>	 A <code>System.Reflection.MethodBody/RuntimeMethodBody</code> object representing the method <i>method</i>.
 </div>
        </div><!--mapi-description -->
    </div><!--height container -->
--- a/Show More
+++ b/Show More