commit 5184e40ce550524231dd51a000e90e84dcdcbe41 · pyrox.dev/nixpkgs

pkgs/development/tools/godot/3/default.nix

···

       83
       83
        
           # of the OS. This isn't as surgical as just fixing the PATH, but it seems to work, and

     

       84
       84
        
           # seems to be the Nix community's current strategy when using Scons.

     

       85
       85
        
           /SConstruct/dontClobberEnvironment.patch

     

       86
       86
       +
           # Fix compile error with mono 6.14

     

       87
       87
       +
           # https://github.com/godotengine/godot/pull/106578

     

       88
       88
       +
           /move-MonoGCHandle-into-gdmono-namespace.patch

     

       86
       89
        
         ];

     

       87
       90
        
       

     

       88
       91
        
         enableParallelBuilding = true;

+403

pkgs/development/tools/godot/3/patches/move-MonoGCHandle-into-gdmono-namespace.patch

···

       1
       1
       +
       From 7f90c622f5f04ad6aed5729913684a64827b751f Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: David McFarland <corngood@gmail.com>

     

       3
       3
       +
       Date: Sun, 18 May 2025 20:56:50 -0300

     

       4
       4
       +
       Subject: [PATCH] mono: move MonoGCHandle into gdmono namespace

     

       5
       5
       +
       

     

       6
       6
       +
       This conflicts with ::MonoGCHandle in mono 6.14 (maintained by winehq).

     

       7
       7
       +
       ---

     

       8
       8
       +
        modules/mono/csharp_script.cpp             | 44 +++++++++++-----------

     

       9
       9
       +
        modules/mono/csharp_script.h               | 10 ++---

     

       10
       10
       +
        modules/mono/glue/base_object_glue.cpp     |  4 +-

     

       11
       11
       +
        modules/mono/mono_gc_handle.cpp            |  4 ++

     

       12
       12
       +
        modules/mono/mono_gc_handle.h              |  4 ++

     

       13
       13
       +
        modules/mono/mono_gd/gd_mono_cache.cpp     |  4 +-

     

       14
       14
       +
        modules/mono/mono_gd/gd_mono_cache.h       |  2 +-

     

       15
       15
       +
        modules/mono/mono_gd/gd_mono_internals.cpp |  4 +-

     

       16
       16
       +
        modules/mono/mono_gd/gd_mono_utils.cpp     |  4 +-

     

       17
       17
       +
        modules/mono/signal_awaiter_utils.cpp      |  2 +-

     

       18
       18
       +
        modules/mono/signal_awaiter_utils.h        |  4 +-

     

       19
       19
       +
        11 files changed, 47 insertions(+), 39 deletions(-)

     

       20
       20
       +
       

     

       21
       21
       +
       diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp

     

       22
       22
       +
       index fa041f4cba..2ad9722eca 100644

     

       23
       23
       +
       --- a/modules/mono/csharp_script.cpp

     

       24
       24
       +
       +++ b/modules/mono/csharp_script.cpp

     

       25
       25
       +
       @@ -653,7 +653,7 @@ void CSharpLanguage::pre_unsafe_unreference(Object *p_obj) {

     

       26
       26
       +
        

     

       27
       27
       +
        void CSharpLanguage::frame() {

     

       28
       28
       +
        	if (gdmono && gdmono->is_runtime_initialized() && gdmono->get_core_api_assembly() != NULL) {

     

       29
       29
       +
       -		const Ref<MonoGCHandle> &task_scheduler_handle = GDMonoCache::cached_data.task_scheduler_handle;

     

       30
       30
       +
       +		const Ref<gdmono::MonoGCHandle> &task_scheduler_handle = GDMonoCache::cached_data.task_scheduler_handle;

     

       31
       31
       +
        

     

       32
       32
       +
        		if (task_scheduler_handle.is_valid()) {

     

       33
       33
       +
        			MonoObject *task_scheduler = task_scheduler_handle->get_target();

     

       34
       34
       +
       @@ -1189,15 +1189,15 @@ void CSharpLanguage::set_language_index(int p_idx) {

     

       35
       35
       +
        	lang_idx = p_idx;

     

       36
       36
       +
        }

     

       37
       37
       +
        

     

       38
       38
       +
       -void CSharpLanguage::release_script_gchandle(Ref<MonoGCHandle> &p_gchandle) {

     

       39
       39
       +
       +void CSharpLanguage::release_script_gchandle(Ref<gdmono::MonoGCHandle> &p_gchandle) {

     

       40
       40
       +
        	if (!p_gchandle->is_released()) { // Do not lock unnecessarily

     

       41
       41
       +
        		MutexLock lock(get_singleton()->script_gchandle_release_mutex);

     

       42
       42
       +
        		p_gchandle->release();

     

       43
       43
       +
        	}

     

       44
       44
       +
        }

     

       45
       45
       +
        

     

       46
       46
       +
       -void CSharpLanguage::release_script_gchandle(MonoObject *p_expected_obj, Ref<MonoGCHandle> &p_gchandle) {

     

       47
       47
       +
       -	uint32_t pinned_gchandle = MonoGCHandle::new_strong_handle_pinned(p_expected_obj); // We might lock after this, so pin it

     

       48
       48
       +
       +void CSharpLanguage::release_script_gchandle(MonoObject *p_expected_obj, Ref<gdmono::MonoGCHandle> &p_gchandle) {

     

       49
       49
       +
       +	uint32_t pinned_gchandle = gdmono::MonoGCHandle::new_strong_handle_pinned(p_expected_obj); // We might lock after this, so pin it

     

       50
       50
       +
        

     

       51
       51
       +
        	if (!p_gchandle->is_released()) { // Do not lock unnecessarily

     

       52
       52
       +
        		MutexLock lock(get_singleton()->script_gchandle_release_mutex);

     

       53
       53
       +
       @@ -1213,7 +1213,7 @@ void CSharpLanguage::release_script_gchandle(MonoObject *p_expected_obj, Ref<Mon

     

       54
       54
       +
        		}

     

       55
       55
       +
        	}

     

       56
       56
       +
        

     

       57
       57
       +
       -	MonoGCHandle::free_handle(pinned_gchandle);

     

       58
       58
       +
       +	gdmono::MonoGCHandle::free_handle(pinned_gchandle);

     

       59
       59
       +
        }

     

       60
       60
       +
        

     

       61
       61
       +
        CSharpLanguage::CSharpLanguage() {

     

       62
       62
       +
       @@ -1267,7 +1267,7 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b

     

       63
       63
       +
        	r_script_binding.inited = true;

     

       64
       64
       +
        	r_script_binding.type_name = type_name;

     

       65
       65
       +
        	r_script_binding.wrapper_class = type_class; // cache

     

       66
       66
       +
       -	r_script_binding.gchandle = MonoGCHandle::create_strong(mono_object);

     

       67
       67
       +
       +	r_script_binding.gchandle = gdmono::MonoGCHandle::create_strong(mono_object);

     

       68
       68
       +
        	r_script_binding.owner = p_object;

     

       69
       69
       +
        

     

       70
       70
       +
        	// Tie managed to unmanaged

     

       71
       71
       +
       @@ -1351,7 +1351,7 @@ void CSharpLanguage::refcount_incremented_instance_binding(Object *p_object) {

     

       72
       72
       +
        	CRASH_COND(!data);

     

       73
       73
       +
        

     

       74
       74
       +
        	CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();

     

       75
       75
       +
       -	Ref<MonoGCHandle> &gchandle = script_binding.gchandle;

     

       76
       76
       +
       +	Ref<gdmono::MonoGCHandle> &gchandle = script_binding.gchandle;

     

       77
       77
       +
        

     

       78
       78
       +
        	if (!script_binding.inited)

     

       79
       79
       +
        		return;

     

       80
       80
       +
       @@ -1368,9 +1368,9 @@ void CSharpLanguage::refcount_incremented_instance_binding(Object *p_object) {

     

       81
       81
       +
        			return; // Called after the managed side was collected, so nothing to do here

     

       82
       82
       +
        

     

       83
       83
       +
        		// Release the current weak handle and replace it with a strong handle.

     

       84
       84
       +
       -		uint32_t strong_gchandle = MonoGCHandle::new_strong_handle(target);

     

       85
       85
       +
       +		uint32_t strong_gchandle = gdmono::MonoGCHandle::new_strong_handle(target);

     

       86
       86
       +
        		gchandle->release();

     

       87
       87
       +
       -		gchandle->set_handle(strong_gchandle, MonoGCHandle::STRONG_HANDLE);

     

       88
       88
       +
       +		gchandle->set_handle(strong_gchandle, gdmono::MonoGCHandle::STRONG_HANDLE);

     

       89
       89
       +
        	}

     

       90
       90
       +
        }

     

       91
       91
       +
        

     

       92
       92
       +
       @@ -1386,7 +1386,7 @@ bool CSharpLanguage::refcount_decremented_instance_binding(Object *p_object) {

     

       93
       93
       +
        	CRASH_COND(!data);

     

       94
       94
       +
        

     

       95
       95
       +
        	CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();

     

       96
       96
       +
       -	Ref<MonoGCHandle> &gchandle = script_binding.gchandle;

     

       97
       97
       +
       +	Ref<gdmono::MonoGCHandle> &gchandle = script_binding.gchandle;

     

       98
       98
       +
        

     

       99
       99
       +
        	int refcount = ref_owner->reference_get_count();

     

       100
       100
       +
        

     

       101
       101
       +
       @@ -1404,9 +1404,9 @@ bool CSharpLanguage::refcount_decremented_instance_binding(Object *p_object) {

     

       102
       102
       +
        			return refcount == 0; // Called after the managed side was collected, so nothing to do here

     

       103
       103
       +
        

     

       104
       104
       +
        		// Release the current strong handle and replace it with a weak handle.

     

       105
       105
       +
       -		uint32_t weak_gchandle = MonoGCHandle::new_weak_handle(target);

     

       106
       106
       +
       +		uint32_t weak_gchandle = gdmono::MonoGCHandle::new_weak_handle(target);

     

       107
       107
       +
        		gchandle->release();

     

       108
       108
       +
       -		gchandle->set_handle(weak_gchandle, MonoGCHandle::WEAK_HANDLE);

     

       109
       109
       +
       +		gchandle->set_handle(weak_gchandle, gdmono::MonoGCHandle::WEAK_HANDLE);

     

       110
       110
       +
        

     

       111
       111
       +
        		return false;

     

       112
       112
       +
        	}

     

       113
       113
       +
       @@ -1414,7 +1414,7 @@ bool CSharpLanguage::refcount_decremented_instance_binding(Object *p_object) {

     

       114
       114
       +
        	return refcount == 0;

     

       115
       115
       +
        }

     

       116
       116
       +
        

     

       117
       117
       +
       -CSharpInstance *CSharpInstance::create_for_managed_type(Object *p_owner, CSharpScript *p_script, const Ref<MonoGCHandle> &p_gchandle) {

     

       118
       118
       +
       +CSharpInstance *CSharpInstance::create_for_managed_type(Object *p_owner, CSharpScript *p_script, const Ref<gdmono::MonoGCHandle> &p_gchandle) {

     

       119
       119
       +
        	CSharpInstance *instance = memnew(CSharpInstance);

     

       120
       120
       +
        

     

       121
       121
       +
        	Reference *ref = Object::cast_to<Reference>(p_owner);

     

       122
       122
       +
       @@ -1832,7 +1832,7 @@ MonoObject *CSharpInstance::_internal_new_managed() {

     

       123
       123
       +
        	}

     

       124
       124
       +
        

     

       125
       125
       +
        	// Tie managed to unmanaged

     

       126
       126
       +
       -	gchandle = MonoGCHandle::create_strong(mono_object);

     

       127
       127
       +
       +	gchandle = gdmono::MonoGCHandle::create_strong(mono_object);

     

       128
       128
       +
        

     

       129
       129
       +
        	if (base_ref)

     

       130
       130
       +
        		_reference_owner_unsafe(); // Here, after assigning the gchandle (for the refcount_incremented callback)

     

       131
       131
       +
       @@ -1902,9 +1902,9 @@ void CSharpInstance::refcount_incremented() {

     

       132
       132
       +
        		// so the owner must hold the managed side alive again to avoid it from being GCed.

     

       133
       133
       +
        

     

       134
       134
       +
        		// Release the current weak handle and replace it with a strong handle.

     

       135
       135
       +
       -		uint32_t strong_gchandle = MonoGCHandle::new_strong_handle(gchandle->get_target());

     

       136
       136
       +
       +		uint32_t strong_gchandle = gdmono::MonoGCHandle::new_strong_handle(gchandle->get_target());

     

       137
       137
       +
        		gchandle->release();

     

       138
       138
       +
       -		gchandle->set_handle(strong_gchandle, MonoGCHandle::STRONG_HANDLE);

     

       139
       139
       +
       +		gchandle->set_handle(strong_gchandle, gdmono::MonoGCHandle::STRONG_HANDLE);

     

       140
       140
       +
        	}

     

       141
       141
       +
        }

     

       142
       142
       +
        

     

       143
       143
       +
       @@ -1925,9 +1925,9 @@ bool CSharpInstance::refcount_decremented() {

     

       144
       144
       +
        		// the managed instance takes responsibility of deleting the owner when GCed.

     

       145
       145
       +
        

     

       146
       146
       +
        		// Release the current strong handle and replace it with a weak handle.

     

       147
       147
       +
       -		uint32_t weak_gchandle = MonoGCHandle::new_weak_handle(gchandle->get_target());

     

       148
       148
       +
       +		uint32_t weak_gchandle = gdmono::MonoGCHandle::new_weak_handle(gchandle->get_target());

     

       149
       149
       +
        		gchandle->release();

     

       150
       150
       +
       -		gchandle->set_handle(weak_gchandle, MonoGCHandle::WEAK_HANDLE);

     

       151
       151
       +
       +		gchandle->set_handle(weak_gchandle, gdmono::MonoGCHandle::WEAK_HANDLE);

     

       152
       152
       +
        

     

       153
       153
       +
        		return false;

     

       154
       154
       +
        	}

     

       155
       155
       +
       @@ -2298,7 +2298,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda

     

       156
       156
       +
        				return false;

     

       157
       157
       +
        			}

     

       158
       158
       +
        

     

       159
       159
       +
       -			tmp_pinned_gchandle = MonoGCHandle::new_strong_handle_pinned(tmp_object); // pin it (not sure if needed)

     

       160
       160
       +
       +			tmp_pinned_gchandle = gdmono::MonoGCHandle::new_strong_handle_pinned(tmp_object); // pin it (not sure if needed)

     

       161
       161
       +
        

     

       162
       162
       +
        			GDMonoMethod *ctor = script_class->get_method(CACHED_STRING_NAME(dotctor), 0);

     

       163
       163
       +
        

     

       164
       164
       +
       @@ -2313,7 +2313,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda

     

       165
       165
       +
        			if (ctor_exc) {

     

       166
       166
       +
        				// TODO: Should we free 'tmp_native' if the exception was thrown after its creation?

     

       167
       167
       +
        

     

       168
       168
       +
       -				MonoGCHandle::free_handle(tmp_pinned_gchandle);

     

       169
       169
       +
       +				gdmono::MonoGCHandle::free_handle(tmp_pinned_gchandle);

     

       170
       170
       +
        				tmp_object = NULL;

     

       171
       171
       +
        

     

       172
       172
       +
        				ERR_PRINT("Exception thrown from constructor of temporary MonoObject:");

     

       173
       173
       +
       @@ -2409,7 +2409,7 @@ bool CSharpScript::_update_exports(PlaceHolderScriptInstance *p_instance_to_upda

     

       174
       174
       +
        				GDMonoUtils::debug_print_unhandled_exception(exc);

     

       175
       175
       +
        			}

     

       176
       176
       +
        

     

       177
       177
       +
       -			MonoGCHandle::free_handle(tmp_pinned_gchandle);

     

       178
       178
       +
       +			gdmono::MonoGCHandle::free_handle(tmp_pinned_gchandle);

     

       179
       179
       +
        			tmp_object = NULL;

     

       180
       180
       +
        

     

       181
       181
       +
        			if (tmp_native && !base_ref) {

     

       182
       182
       +
       @@ -2970,7 +2970,7 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg

     

       183
       183
       +
        	}

     

       184
       184
       +
        

     

       185
       185
       +
        	// Tie managed to unmanaged

     

       186
       186
       +
       -	instance->gchandle = MonoGCHandle::create_strong(mono_object);

     

       187
       187
       +
       +	instance->gchandle = gdmono::MonoGCHandle::create_strong(mono_object);

     

       188
       188
       +
        

     

       189
       189
       +
        	if (instance->base_ref)

     

       190
       190
       +
        		instance->_reference_owner_unsafe(); // Here, after assigning the gchandle (for the refcount_incremented callback)

     

       191
       191
       +
       diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h

     

       192
       192
       +
       index 3be55848d5..7b3981ef90 100644

     

       193
       193
       +
       --- a/modules/mono/csharp_script.h

     

       194
       194
       +
       +++ b/modules/mono/csharp_script.h

     

       195
       195
       +
       @@ -220,7 +220,7 @@ class CSharpInstance : public ScriptInstance {

     

       196
       196
       +
        	bool destructing_script_instance;

     

       197
       197
       +
        

     

       198
       198
       +
        	Ref<CSharpScript> script;

     

       199
       199
       +
       -	Ref<MonoGCHandle> gchandle;

     

       200
       200
       +
       +	Ref<gdmono::MonoGCHandle> gchandle;

     

       201
       201
       +
        

     

       202
       202
       +
        	bool _reference_owner_unsafe();

     

       203
       203
       +
        

     

       204
       204
       +
       @@ -236,7 +236,7 @@ class CSharpInstance : public ScriptInstance {

     

       205
       205
       +
        

     

       206
       206
       +
        	// Do not use unless you know what you are doing

     

       207
       207
       +
        	friend void GDMonoInternals::tie_managed_to_unmanaged(MonoObject *, Object *);

     

       208
       208
       +
       -	static CSharpInstance *create_for_managed_type(Object *p_owner, CSharpScript *p_script, const Ref<MonoGCHandle> &p_gchandle);

     

       209
       209
       +
       +	static CSharpInstance *create_for_managed_type(Object *p_owner, CSharpScript *p_script, const Ref<gdmono::MonoGCHandle> &p_gchandle);

     

       210
       210
       +
        

     

       211
       211
       +
        	void _call_multilevel(MonoObject *p_mono_object, const StringName &p_method, const Variant **p_args, int p_argcount);

     

       212
       212
       +
        

     

       213
       213
       +
       @@ -293,7 +293,7 @@ struct CSharpScriptBinding {

     

       214
       214
       +
        	bool inited;

     

       215
       215
       +
        	StringName type_name;

     

       216
       216
       +
        	GDMonoClass *wrapper_class;

     

       217
       217
       +
       -	Ref<MonoGCHandle> gchandle;

     

       218
       218
       +
       +	Ref<gdmono::MonoGCHandle> gchandle;

     

       219
       219
       +
        	Object *owner;

     

       220
       220
       +
        };

     

       221
       221
       +
        

     

       222
       222
       +
       @@ -371,8 +371,8 @@ public:

     

       223
       223
       +
        	_FORCE_INLINE_ EditorPlugin *get_godotsharp_editor() const { return godotsharp_editor; }

     

       224
       224
       +
        #endif

     

       225
       225
       +
        

     

       226
       226
       +
       -	static void release_script_gchandle(Ref<MonoGCHandle> &p_gchandle);

     

       227
       227
       +
       -	static void release_script_gchandle(MonoObject *p_expected_obj, Ref<MonoGCHandle> &p_gchandle);

     

       228
       228
       +
       +	static void release_script_gchandle(Ref<gdmono::MonoGCHandle> &p_gchandle);

     

       229
       229
       +
       +	static void release_script_gchandle(MonoObject *p_expected_obj, Ref<gdmono::MonoGCHandle> &p_gchandle);

     

       230
       230
       +
        

     

       231
       231
       +
        	bool debug_break(const String &p_error, bool p_allow_continue = true);

     

       232
       232
       +
        	bool debug_break_parse(const String &p_file, int p_line, const String &p_error);

     

       233
       233
       +
       diff --git a/modules/mono/glue/base_object_glue.cpp b/modules/mono/glue/base_object_glue.cpp

     

       234
       234
       +
       index 7a3ec459de..4931583884 100644

     

       235
       235
       +
       --- a/modules/mono/glue/base_object_glue.cpp

     

       236
       236
       +
       +++ b/modules/mono/glue/base_object_glue.cpp

     

       237
       237
       +
       @@ -70,7 +70,7 @@ void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr) {

     

       238
       238
       +
        	if (data) {

     

       239
       239
       +
        		CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();

     

       240
       240
       +
        		if (script_binding.inited) {

     

       241
       241
       +
       -			Ref<MonoGCHandle> &gchandle = script_binding.gchandle;

     

       242
       242
       +
       +			Ref<gdmono::MonoGCHandle> &gchandle = script_binding.gchandle;

     

       243
       243
       +
        			if (gchandle.is_valid()) {

     

       244
       244
       +
        				CSharpLanguage::release_script_gchandle(p_obj, gchandle);

     

       245
       245
       +
        			}

     

       246
       246
       +
       @@ -117,7 +117,7 @@ void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolea

     

       247
       247
       +
        		if (data) {

     

       248
       248
       +
        			CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();

     

       249
       249
       +
        			if (script_binding.inited) {

     

       250
       250
       +
       -				Ref<MonoGCHandle> &gchandle = script_binding.gchandle;

     

       251
       251
       +
       +				Ref<gdmono::MonoGCHandle> &gchandle = script_binding.gchandle;

     

       252
       252
       +
        				if (gchandle.is_valid()) {

     

       253
       253
       +
        					CSharpLanguage::release_script_gchandle(p_obj, gchandle);

     

       254
       254
       +
        				}

     

       255
       255
       +
       diff --git a/modules/mono/mono_gc_handle.cpp b/modules/mono/mono_gc_handle.cpp

     

       256
       256
       +
       index eb2227dd78..e70c701331 100644

     

       257
       257
       +
       --- a/modules/mono/mono_gc_handle.cpp

     

       258
       258
       +
       +++ b/modules/mono/mono_gc_handle.cpp

     

       259
       259
       +
       @@ -32,6 +32,8 @@

     

       260
       260
       +
        

     

       261
       261
       +
        #include "mono_gd/gd_mono.h"

     

       262
       262
       +
        

     

       263
       263
       +
       +namespace gdmono {

     

       264
       264
       +
       +

     

       265
       265
       +
        uint32_t MonoGCHandle::new_strong_handle(MonoObject *p_object) {

     

       266
       266
       +
        	return mono_gchandle_new(p_object, /* pinned: */ false);

     

       267
       267
       +
        }

     

       268
       268
       +
       @@ -76,3 +78,5 @@ MonoGCHandle::MonoGCHandle(uint32_t p_handle, HandleType p_handle_type) {

     

       269
       269
       +
        MonoGCHandle::~MonoGCHandle() {

     

       270
       270
       +
        	release();

     

       271
       271
       +
        }

     

       272
       272
       +
       +

     

       273
       273
       +
       +} // namespace gdmono

     

       274
       274
       +
       diff --git a/modules/mono/mono_gc_handle.h b/modules/mono/mono_gc_handle.h

     

       275
       275
       +
       index 5f99a46479..28fcbd7a78 100644

     

       276
       276
       +
       --- a/modules/mono/mono_gc_handle.h

     

       277
       277
       +
       +++ b/modules/mono/mono_gc_handle.h

     

       278
       278
       +
       @@ -35,6 +35,8 @@

     

       279
       279
       +
        

     

       280
       280
       +
        #include "core/reference.h"

     

       281
       281
       +
        

     

       282
       282
       +
       +namespace gdmono {

     

       283
       283
       +
       +

     

       284
       284
       +
        class MonoGCHandle : public Reference {

     

       285
       285
       +
        	GDCLASS(MonoGCHandle, Reference);

     

       286
       286
       +
        

     

       287
       287
       +
       @@ -72,4 +74,6 @@ public:

     

       288
       288
       +
        	~MonoGCHandle();

     

       289
       289
       +
        };

     

       290
       290
       +
        

     

       291
       291
       +
       +} // namespace gdmono

     

       292
       292
       +
       +

     

       293
       293
       +
        #endif // MONO_GC_HANDLE_H

     

       294
       294
       +
       diff --git a/modules/mono/mono_gd/gd_mono_cache.cpp b/modules/mono/mono_gd/gd_mono_cache.cpp

     

       295
       295
       +
       index 2ece9d0f36..976a8f2ff2 100644

     

       296
       296
       +
       --- a/modules/mono/mono_gd/gd_mono_cache.cpp

     

       297
       297
       +
       +++ b/modules/mono/mono_gd/gd_mono_cache.cpp

     

       298
       298
       +
       @@ -178,7 +178,7 @@ void CachedData::clear_godot_api_cache() {

     

       299
       299
       +
        

     

       300
       300
       +
        	// End of MarshalUtils methods

     

       301
       301
       +
        

     

       302
       302
       +
       -	task_scheduler_handle = Ref<MonoGCHandle>();

     

       303
       303
       +
       +	task_scheduler_handle = Ref<gdmono::MonoGCHandle>();

     

       304
       304
       +
        }

     

       305
       305
       +
        

     

       306
       306
       +
        #define GODOT_API_CLASS(m_class) (GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, #m_class))

     

       307
       307
       +
       @@ -300,7 +300,7 @@ void update_godot_api_cache() {

     

       308
       308
       +
        	// TODO Move to CSharpLanguage::init() and do handle disposal

     

       309
       309
       +
        	MonoObject *task_scheduler = mono_object_new(mono_domain_get(), GODOT_API_CLASS(GodotTaskScheduler)->get_mono_ptr());

     

       310
       310
       +
        	GDMonoUtils::runtime_object_init(task_scheduler, GODOT_API_CLASS(GodotTaskScheduler));

     

       311
       311
       +
       -	cached_data.task_scheduler_handle = MonoGCHandle::create_strong(task_scheduler);

     

       312
       312
       +
       +	cached_data.task_scheduler_handle = gdmono::MonoGCHandle::create_strong(task_scheduler);

     

       313
       313
       +
        

     

       314
       314
       +
        	cached_data.godot_api_cache_updated = true;

     

       315
       315
       +
        }

     

       316
       316
       +
       diff --git a/modules/mono/mono_gd/gd_mono_cache.h b/modules/mono/mono_gd/gd_mono_cache.h

     

       317
       317
       +
       index 2ed8482552..a4e05bbf5b 100644

     

       318
       318
       +
       --- a/modules/mono/mono_gd/gd_mono_cache.h

     

       319
       319
       +
       +++ b/modules/mono/mono_gd/gd_mono_cache.h

     

       320
       320
       +
       @@ -149,7 +149,7 @@ struct CachedData {

     

       321
       321
       +
        

     

       322
       322
       +
        	// End of MarshalUtils methods

     

       323
       323
       +
        

     

       324
       324
       +
       -	Ref<MonoGCHandle> task_scheduler_handle;

     

       325
       325
       +
       +	Ref<gdmono::MonoGCHandle> task_scheduler_handle;

     

       326
       326
       +
        

     

       327
       327
       +
        	bool corlib_cache_updated;

     

       328
       328
       +
        	bool godot_api_cache_updated;

     

       329
       329
       +
       diff --git a/modules/mono/mono_gd/gd_mono_internals.cpp b/modules/mono/mono_gd/gd_mono_internals.cpp

     

       330
       330
       +
       index 4d2209ccec..a0102335b7 100644

     

       331
       331
       +
       --- a/modules/mono/mono_gd/gd_mono_internals.cpp

     

       332
       332
       +
       +++ b/modules/mono/mono_gd/gd_mono_internals.cpp

     

       333
       333
       +
       @@ -71,7 +71,7 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {

     

       334
       334
       +
        		script_binding.inited = true;

     

       335
       335
       +
        		script_binding.type_name = NATIVE_GDMONOCLASS_NAME(klass);

     

       336
       336
       +
        		script_binding.wrapper_class = klass;

     

       337
       337
       +
       -		script_binding.gchandle = ref ? MonoGCHandle::create_weak(managed) : MonoGCHandle::create_strong(managed);

     

       338
       338
       +
       +		script_binding.gchandle = ref ? gdmono::MonoGCHandle::create_weak(managed) : gdmono::MonoGCHandle::create_strong(managed);

     

       339
       339
       +
        		script_binding.owner = unmanaged;

     

       340
       340
       +
        

     

       341
       341
       +
        		if (ref) {

     

       342
       342
       +
       @@ -101,7 +101,7 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {

     

       343
       343
       +
        		return;

     

       344
       344
       +
        	}

     

       345
       345
       +
        

     

       346
       346
       +
       -	Ref<MonoGCHandle> gchandle = ref ? MonoGCHandle::create_weak(managed) : MonoGCHandle::create_strong(managed);

     

       347
       347
       +
       +	Ref<gdmono::MonoGCHandle> gchandle = ref ? gdmono::MonoGCHandle::create_weak(managed) : gdmono::MonoGCHandle::create_strong(managed);

     

       348
       348
       +
        

     

       349
       349
       +
        	Ref<CSharpScript> script = CSharpScript::create_for_managed_type(klass, native);

     

       350
       350
       +
        

     

       351
       351
       +
       diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp

     

       352
       352
       +
       index 4b6b0af21f..0f6545c6ef 100644

     

       353
       353
       +
       --- a/modules/mono/mono_gd/gd_mono_utils.cpp

     

       354
       354
       +
       +++ b/modules/mono/mono_gd/gd_mono_utils.cpp

     

       355
       355
       +
       @@ -83,7 +83,7 @@ MonoObject *unmanaged_get_managed(Object *unmanaged) {

     

       356
       356
       +
        		}

     

       357
       357
       +
        	}

     

       358
       358
       +
        

     

       359
       359
       +
       -	Ref<MonoGCHandle> &gchandle = script_binding.gchandle;

     

       360
       360
       +
       +	Ref<gdmono::MonoGCHandle> &gchandle = script_binding.gchandle;

     

       361
       361
       +
        	ERR_FAIL_COND_V(gchandle.is_null(), NULL);

     

       362
       362
       +
        

     

       363
       363
       +
        	MonoObject *target = gchandle->get_target();

     

       364
       364
       +
       @@ -103,7 +103,7 @@ MonoObject *unmanaged_get_managed(Object *unmanaged) {

     

       365
       365
       +
        	MonoObject *mono_object = GDMonoUtils::create_managed_for_godot_object(script_binding.wrapper_class, script_binding.type_name, unmanaged);

     

       366
       366
       +
        	ERR_FAIL_NULL_V(mono_object, NULL);

     

       367
       367
       +
        

     

       368
       368
       +
       -	gchandle->set_handle(MonoGCHandle::new_strong_handle(mono_object), MonoGCHandle::STRONG_HANDLE);

     

       369
       369
       +
       +	gchandle->set_handle(gdmono::MonoGCHandle::new_strong_handle(mono_object), gdmono::MonoGCHandle::STRONG_HANDLE);

     

       370
       370
       +
        

     

       371
       371
       +
        	// Tie managed to unmanaged

     

       372
       372
       +
        	Reference *ref = Object::cast_to<Reference>(unmanaged);

     

       373
       373
       +
       diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp

     

       374
       374
       +
       index 6c7bb1028c..f3adf4cd77 100644

     

       375
       375
       +
       --- a/modules/mono/signal_awaiter_utils.cpp

     

       376
       376
       +
       +++ b/modules/mono/signal_awaiter_utils.cpp

     

       377
       377
       +
       @@ -117,7 +117,7 @@ void SignalAwaiterHandle::_bind_methods() {

     

       378
       378
       +
        }

     

       379
       379
       +
        

     

       380
       380
       +
        SignalAwaiterHandle::SignalAwaiterHandle(MonoObject *p_managed) :

     

       381
       381
       +
       -		MonoGCHandle(MonoGCHandle::new_strong_handle(p_managed), STRONG_HANDLE) {

     

       382
       382
       +
       +		gdmono::MonoGCHandle(gdmono::MonoGCHandle::new_strong_handle(p_managed), STRONG_HANDLE) {

     

       383
       383
       +
        #ifdef DEBUG_ENABLED

     

       384
       384
       +
        	conn_target_id = 0;

     

       385
       385
       +
        #endif

     

       386
       386
       +
       diff --git a/modules/mono/signal_awaiter_utils.h b/modules/mono/signal_awaiter_utils.h

     

       387
       387
       +
       index 5a8154b001..8cf20e98fd 100644

     

       388
       388
       +
       --- a/modules/mono/signal_awaiter_utils.h

     

       389
       389
       +
       +++ b/modules/mono/signal_awaiter_utils.h

     

       390
       390
       +
       @@ -39,8 +39,8 @@ namespace SignalAwaiterUtils {

     

       391
       391
       +
        Error connect_signal_awaiter(Object *p_source, const String &p_signal, Object *p_target, MonoObject *p_awaiter);

     

       392
       392
       +
        }

     

       393
       393
       +
        

     

       394
       394
       +
       -class SignalAwaiterHandle : public MonoGCHandle {

     

       395
       395
       +
       -	GDCLASS(SignalAwaiterHandle, MonoGCHandle);

     

       396
       396
       +
       +class SignalAwaiterHandle : public gdmono::MonoGCHandle {

     

       397
       397
       +
       +	GDCLASS(SignalAwaiterHandle, gdmono::MonoGCHandle);

     

       398
       398
       +
        

     

       399
       399
       +
        	bool completed;

     

       400
       400
       +
        

     

       401
       401
       +
       -- 

     

       402
       402
       +
       2.49.0

     

       403
       403
       +