Return capabilities if hot reload component is available, even if env…

… var isn't set. Match CoreCLR behavior. Also makes our testsuite actually run the tests (we check for capabilities before running setting DOTNET_MODIFIABLE_ASSEMBLIES using the remote executor)
dotnet · Jun 12, 2021 · 1b90e05 · 1b90e05
1 parent a1a11b5
commit 1b90e05
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/mono/mono/metadata/icall.c b/src/mono/mono/metadata/icall.c
@@ -5757,7 +5757,7 @@ ves_icall_AssemblyExtensions_ApplyUpdate (MonoAssembly *assm,
 
 gint32 ves_icall_AssemblyExtensions_ApplyUpdateEnabled (void)
 {
- return mono_metadata_update_enabled (NULL) ? 1 : 0;
+ return mono_metadata_update_available ();
 }
 #endif
 

diff --git a/src/mono/mono/metadata/metadata-update.c b/src/mono/mono/metadata/metadata-update.c
@@ -14,6 +14,12 @@
 #include "mono/metadata/components.h"
 #include "mono/component/hot_reload.h"
 
+gboolean
+mono_metadata_update_available (void)
+{
+ return mono_component_hot_reload ()->component.available ();
+}
+
 #ifdef ENABLE_METADATA_UPDATE
 
 MonoMetadataUpdateData mono_metadata_update_data_private;

diff --git a/src/mono/mono/metadata/metadata-update.h b/src/mono/mono/metadata/metadata-update.h
@@ -21,6 +21,9 @@ enum MonoModifiableAssemblies {
 
 typedef MonoStreamHeader* (*MetadataHeapGetterFunc) (MonoImage*);
 
+gboolean
+mono_metadata_update_available (void);
+
 #ifdef ENABLE_METADATA_UPDATE
 
 gboolean