1 files changed, 65 insertions, 28 deletions

diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp
index d02c73978e..db136a1313 100644
--- a/modules/mono/mono_gd/gd_mono_utils.cpp
+++ b/modules/mono/mono_gd/gd_mono_utils.cpp
@@ -44,10 +44,13 @@ namespace GDMonoUtils {
 
 MonoCache mono_cache;
 
-#define CACHE_AND_CHECK(m_var, m_val)                                                        \
-	{                                                                                        \
-		m_var = m_val;                                                                       \
-		if (!m_var) ERR_PRINT("Mono Cache: Member " #m_var " is null. This is really bad!"); \
+#define CACHE_AND_CHECK(m_var, m_val)                             \
+	{                                                             \
+		m_var = m_val;                                            \
+		if (!m_var) {                                             \
+			ERR_EXPLAIN("Mono Cache: Member " #m_var " is null"); \
+			ERR_FAIL();                                           \
+		}                                                         \
 	}
 
 #define CACHE_CLASS_AND_CHECK(m_class, m_val) CACHE_AND_CHECK(GDMonoUtils::mono_cache.class_##m_class, m_val)
@@ -111,6 +114,7 @@ void MonoCache::clear_members() {
 	class_ExportAttribute = NULL;
 	field_ExportAttribute_hint = NULL;
 	field_ExportAttribute_hintString = NULL;
+	class_SignalAttribute = NULL;
 	class_ToolAttribute = NULL;
 	class_RemoteAttribute = NULL;
 	class_SyncAttribute = NULL;
@@ -133,7 +137,13 @@ void MonoCache::clear_members() {
 	task_scheduler_handle = Ref<MonoGCHandle>();
 }
 
-#define GODOT_API_CLASS(m_class) (GDMono::get_singleton()->get_api_assembly()->get_class(BINDINGS_NAMESPACE, #m_class))
+void MonoCache::cleanup() {
+
+	corlib_cache_updated = false;
+	godot_api_cache_updated = false;
+}
+
+#define GODOT_API_CLASS(m_class) (GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, #m_class))
 
 void update_corlib_cache() {
 
@@ -158,6 +168,8 @@ void update_corlib_cache() {
 	CACHE_METHOD_AND_CHECK(System_Diagnostics_StackTrace, ctor_bool, CACHED_CLASS(System_Diagnostics_StackTrace)->get_method_with_desc("System.Diagnostics.StackTrace:.ctor(bool)", true));
 	CACHE_METHOD_AND_CHECK(System_Diagnostics_StackTrace, ctor_Exception_bool, CACHED_CLASS(System_Diagnostics_StackTrace)->get_method_with_desc("System.Diagnostics.StackTrace:.ctor(System.Exception,bool)", true));
 #endif
+
+	mono_cache.corlib_cache_updated = true;
 }
 
 void update_godot_api_cache() {
@@ -173,7 +185,7 @@ void update_godot_api_cache() {
 	CACHE_CLASS_AND_CHECK(Color, GODOT_API_CLASS(Color));
 	CACHE_CLASS_AND_CHECK(Plane, GODOT_API_CLASS(Plane));
 	CACHE_CLASS_AND_CHECK(NodePath, GODOT_API_CLASS(NodePath));
-	CACHE_CLASS_AND_CHECK(RID, GODOT_API_CLASS(NodePath));
+	CACHE_CLASS_AND_CHECK(RID, GODOT_API_CLASS(RID));
 	CACHE_CLASS_AND_CHECK(GodotObject, GODOT_API_CLASS(Object));
 	CACHE_CLASS_AND_CHECK(GodotReference, GODOT_API_CLASS(Reference));
 	CACHE_CLASS_AND_CHECK(Node, GODOT_API_CLASS(Node));
@@ -190,6 +202,7 @@ void update_godot_api_cache() {
 	CACHE_CLASS_AND_CHECK(ExportAttribute, GODOT_API_CLASS(ExportAttribute));
 	CACHE_FIELD_AND_CHECK(ExportAttribute, hint, CACHED_CLASS(ExportAttribute)->get_field("hint"));
 	CACHE_FIELD_AND_CHECK(ExportAttribute, hintString, CACHED_CLASS(ExportAttribute)->get_field("hintString"));
+	CACHE_CLASS_AND_CHECK(SignalAttribute, GODOT_API_CLASS(SignalAttribute));
 	CACHE_CLASS_AND_CHECK(ToolAttribute, GODOT_API_CLASS(ToolAttribute));
 	CACHE_CLASS_AND_CHECK(RemoteAttribute, GODOT_API_CLASS(RemoteAttribute));
 	CACHE_CLASS_AND_CHECK(SyncAttribute, GODOT_API_CLASS(SyncAttribute));
@@ -231,6 +244,8 @@ void update_godot_api_cache() {
 	MonoObject *task_scheduler = mono_object_new(SCRIPTS_DOMAIN, GODOT_API_CLASS(GodotTaskScheduler)->get_mono_ptr());
 	mono_runtime_object_init(task_scheduler);
 	mono_cache.task_scheduler_handle = MonoGCHandle::create_strong(task_scheduler);
+
+	mono_cache.godot_api_cache_updated = true;
 }
 
 void clear_cache() {
@@ -290,7 +305,7 @@ GDMonoClass *type_get_proxy_class(const StringName &p_type) {
 	if (class_name[0] == '_')
 		class_name = class_name.substr(1, class_name.length());
 
-	GDMonoClass *klass = GDMono::get_singleton()->get_api_assembly()->get_class(BINDINGS_NAMESPACE, class_name);
+	GDMonoClass *klass = GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, class_name);
 
 #ifdef TOOLS_ENABLED
 	if (!klass) {
@@ -306,7 +321,7 @@ GDMonoClass *get_class_native_base(GDMonoClass *p_class) {
 
 	do {
 		const GDMonoAssembly *assembly = klass->get_assembly();
-		if (assembly == GDMono::get_singleton()->get_api_assembly())
+		if (assembly == GDMono::get_singleton()->get_core_api_assembly())
 			return klass;
 #ifdef TOOLS_ENABLED
 		if (assembly == GDMono::get_singleton()->get_editor_api_assembly())
@@ -402,37 +417,59 @@ void print_unhandled_exception(MonoObject *p_exc) {
 void print_unhandled_exception(MonoObject *p_exc, bool p_recursion_caution) {
 	mono_print_unhandled_exception(p_exc);
 #ifdef DEBUG_ENABLED
-	GDMonoClass *st_klass = CACHED_CLASS(System_Diagnostics_StackTrace);
-	MonoObject *stack_trace = mono_object_new(mono_domain_get(), st_klass->get_mono_ptr());
+	if (!ScriptDebugger::get_singleton())
+		return;
+
+	ScriptLanguage::StackInfo separator;
+	separator.file = "";
+	separator.func = "--- " + RTR("End of inner exception stack trace") + " ---";
+	separator.line = 0;
+
+	Vector<ScriptLanguage::StackInfo> si;
+	String exc_msg = "";
 
-	MonoBoolean need_file_info = true;
-	void *ctor_args[2] = { p_exc, &need_file_info };
+	while (p_exc != NULL) {
+		GDMonoClass *st_klass = CACHED_CLASS(System_Diagnostics_StackTrace);
+		MonoObject *stack_trace = mono_object_new(mono_domain_get(), st_klass->get_mono_ptr());
 
-	MonoObject *unexpected_exc = NULL;
-	CACHED_METHOD(System_Diagnostics_StackTrace, ctor_Exception_bool)->invoke_raw(stack_trace, ctor_args, &unexpected_exc);
+		MonoBoolean need_file_info = true;
+		void *ctor_args[2] = { p_exc, &need_file_info };
 
-	if (unexpected_exc != NULL) {
-		mono_print_unhandled_exception(unexpected_exc);
+		MonoObject *unexpected_exc = NULL;
+		CACHED_METHOD(System_Diagnostics_StackTrace, ctor_Exception_bool)->invoke_raw(stack_trace, ctor_args, &unexpected_exc);
 
-		if (p_recursion_caution) {
-			// Called from CSharpLanguage::get_current_stack_info,
-			// so printing an error here could result in endless recursion
-			OS::get_singleton()->printerr("Mono: Method GDMonoUtils::print_unhandled_exception failed");
-			return;
-		} else {
-			ERR_FAIL();
+		if (unexpected_exc != NULL) {
+			mono_print_unhandled_exception(unexpected_exc);
+
+			if (p_recursion_caution) {
+				// Called from CSharpLanguage::get_current_stack_info,
+				// so printing an error here could result in endless recursion
+				OS::get_singleton()->printerr("Mono: Method GDMonoUtils::print_unhandled_exception failed");
+				return;
+			} else {
+				ERR_FAIL();
+			}
 		}
-	}
 
-	Vector<ScriptLanguage::StackInfo> si;
-	if (stack_trace != NULL && !p_recursion_caution)
-		si = CSharpLanguage::get_singleton()->stack_trace_get_info(stack_trace);
+		Vector<ScriptLanguage::StackInfo> _si;
+		if (stack_trace != NULL && !p_recursion_caution) {
+			_si = CSharpLanguage::get_singleton()->stack_trace_get_info(stack_trace);
+			for (int i = _si.size() - 1; i >= 0; i--)
+				si.insert(0, _si[i]);
+		}
+
+		exc_msg += (exc_msg.length() > 0 ? " ---> " : "") + GDMonoUtils::get_exception_name_and_message(p_exc);
+
+		GDMonoProperty *p_prop = GDMono::get_singleton()->get_class(mono_object_get_class(p_exc))->get_property("InnerException");
+		p_exc = p_prop != NULL ? p_prop->get_value(p_exc) : NULL;
+		if (p_exc != NULL)
+			si.insert(0, separator);
+	}
 
 	String file = si.size() ? si[0].file : __FILE__;
 	String func = si.size() ? si[0].func : FUNCTION_STR;
 	int line = si.size() ? si[0].line : __LINE__;
 	String error_msg = "Unhandled exception";
-	String exc_msg = GDMonoUtils::get_exception_name_and_message(p_exc);
 
 	ScriptDebugger::get_singleton()->send_error(func, file, line, error_msg, exc_msg, ERR_HANDLER_ERROR, si);
 #endif