Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850

docs/deploy/mono-api-gc.html

@@ -498,9 +498,8 @@ mono_gc_reference_queue_new (mono_reference_queue_callback callback)
 	<p />The output of the SCC analysis is passed to the
 	`cross_references()` callback.  It is expected to set the
 	`is_alive` flag on those strongly connected components that it
-	wishes to be kept alive.  Only bridged objects will be
-	reported to the callback, i.e., non-bridged objects are
-	removed from the callback graph.
+	wishes to be kept alive.  The value of `is_alive` will be
+	ignored on any SCCs which lack bridges.
 	
 	<p />In monodroid each bridged object has a corresponding Java
 	mirror object.  In the bridge callback it reifies the Mono
@@ -521,7 +520,7 @@ mono_gc_reference_queue_new (mono_reference_queue_callback callback)
 
 <div class="mapi-header">
 enum {
-        SGEN_BRIDGE_VERSION = 4
+        SGEN_BRIDGE_VERSION = 5
 };
         
 typedef enum {

docs/deploy/mono-api-internal.html

@@ -532,8 +532,7 @@ mono_marshal_get_native_wrapper (MonoMethod *method, gboolean check_exceptions,
             <table class="mapi-parameters"><tbody><tr><td><i>method</i><td> The MonoMethod to wrap.</td></td></tr><tr><td><i>check_exceptions</i><td> Whenever to check for pending exceptions</td></td></tr></tbody></table>             <div class="mapi-section">Description</div>
              <div>	<p /> 
 	 generates IL code for the pinvoke wrapper (the generated method
-	 calls the unmanaged code in piinfo-&gt;addr)
-	 The wrapper info for the wrapper is a WrapperInfo structure.</div>
+	 calls the unmanaged code in piinfo-&gt;addr)</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -570,8 +569,7 @@ mono_marshal_get_ptr_to_struct (MonoClass *klass)
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>klass</i><td></td></td></tr></tbody></table>             <div class="mapi-section">Description</div>
              <div>	<p /> 
-	 generates IL code for PtrToStructure (IntPtr src, object structure)
-	 The wrapper info for the wrapper is a WrapperInfo structure.</div>
+	 generates IL code for PtrToStructure (IntPtr src, object structure)</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->
@@ -698,8 +696,7 @@ mono_marshal_get_struct_to_ptr (MonoClass *klass)
             <div class="mapi-section">Parameters</div>
             <table class="mapi-parameters"><tbody><tr><td><i>klass</i><td></td></td></tr></tbody></table>             <div class="mapi-section">Description</div>
              <div>	<p /> 
-	 generates IL code for StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld)
-	 The wrapper info for the wrapper is a WrapperInfo structure.</div>
+	 generates IL code for StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld)</div>
         </div><!--mapi-description -->
     </div><!--height container -->
 </div> <!-- class=mapi  -->

docs/deploy/mono-api-unsorted.html

@@ -293,7 +293,7 @@ mono_dllmap_insert (MonoImage *assembly, const char *dll, const char *func, cons
 </div>
             <p />
             <div class="mapi-section">Parameters</div>
-            <table class="mapi-parameters"><tbody><tr><td><i>assembly</i><td> if <code>NULL</code>, this is a global mapping, otherwise the remapping of the dynamic library will only apply to the specified assembly</td></td></tr><tr><td><i>dll</i><td> The name of the external library, as it would be found in the DllImport declaration.  If prefixed with 'i:' the matching of the library name is done without case sensitivity</td></td></tr><tr><td><i>func</i><td> if not null, the mapping will only applied to the named function (the value of EntryPoint)</td></td></tr><tr><td><i>tdll</i><td> The name of the library to map the specified <i>dll</i> if it matches.</td></td></tr><tr><td><i>tfunc</i><td> if func is not <code>NULL</code>, the name of the function that replaces the invocation</td></td></tr></tbody></table>             <div class="mapi-section">Description</div>
+            <table class="mapi-parameters"><tbody><tr><td><i>assembly</i><td> if <code>NULL</code>, this is a global mapping, otherwise the remapping of the dynamic library will only apply to the specified assembly</td></td></tr><tr><td><i>dll</i><td> The name of the external library, as it would be found in the DllImport declaration.  If prefixed with 'i:' the matching of the library name is done without case sensitivity</td></td></tr><tr><td><i>func</i><td> if not null, the mapping will only applied to the named function (the value of EntryPoint)</td></td></tr><tr><td><i>tdll</i><td> The name of the library to map the specified <i>dll</i> if it matches.</td></td></tr><tr><td><i>tfunc</i><td> The name of the function that replaces the invocation.  If <code>NULL</code>, it is replaced with a copy of <i>func</i>.</td></td></tr></tbody></table>             <div class="mapi-section">Description</div>
              <div>	<p /> 
 	 LOCKING: Acquires the loader lock.
 	<p />

docs/deploy/mono-api-wapi.html.REMOVED.git-id

@@ -1 +1 @@
-3e44f606f7cee10fd72df9399ead2393fe7e824c
+dc9f5d8b06210d860035b42ede58f35b8e7c32bd