From ff1e7cfbf4b7ad9b327588ce7dffb43d31fee3e9 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 7 May 2018 17:30:03 -0300
Subject: [PATCH] Add is_instance_valid() method to GDScript, ending more than
 a decade of pain.

---
 core/object.cpp                         |  4 ----
 core/object.h                           |  5 -----
 modules/gdscript/gdscript_functions.cpp | 18 +++++++++++++++++-
 modules/gdscript/gdscript_functions.h   |  1 +
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/object.cpp b/core/object.cpp
index aaa37e6cf2f..239700a4abe 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1919,9 +1919,7 @@ ObjectID ObjectDB::add_instance(Object *p_object) {
 
 	rw_lock->write_lock();
 	instances[++instance_counter] = p_object;
-#ifdef DEBUG_ENABLED
 	instance_checks[p_object] = instance_counter;
-#endif
 	rw_lock->write_unlock();
 
 	return instance_counter;
@@ -1932,9 +1930,7 @@ void ObjectDB::remove_instance(Object *p_object) {
 	rw_lock->write_lock();
 
 	instances.erase(p_object->get_instance_id());
-#ifdef DEBUG_ENABLED
 	instance_checks.erase(p_object);
-#endif
 
 	rw_lock->write_unlock();
 }
diff --git a/core/object.h b/core/object.h
index 8306b5a356f..c405e22557f 100644
--- a/core/object.h
+++ b/core/object.h
@@ -762,15 +762,10 @@ public:
 	static void debug_objects(DebugFunc p_func);
 	static int get_object_count();
 
-#ifdef DEBUG_ENABLED
 	_FORCE_INLINE_ static bool instance_validate(Object *p_ptr) {
 
 		return instance_checks.has(p_ptr);
 	}
-#else
-	_FORCE_INLINE_ static bool instance_validate(Object *p_ptr) { return true; }
-
-#endif
 };
 
 //needed by macros
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp
index 278585cb014..8d25dfec0d6 100644
--- a/modules/gdscript/gdscript_functions.cpp
+++ b/modules/gdscript/gdscript_functions.cpp
@@ -122,6 +122,7 @@ const char *GDScriptFunctions::get_func_name(Function p_func) {
 		"print_stack",
 		"instance_from_id",
 		"len",
+		"is_instance_valid",
 	};
 
 	return _names[p_func];
@@ -1276,6 +1277,17 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 				}
 			}
 
+		} break;
+		case IS_INSTANCE_VALID: {
+
+			VALIDATE_ARG_COUNT(1);
+			if (p_args[0]->get_type() != Variant::OBJECT) {
+				r_ret = false;
+			} else {
+				Object *obj = *p_args[0];
+				r_ret = ObjectDB::instance_validate(obj);
+			}
+
 		} break;
 		case FUNC_MAX: {
 
@@ -1798,7 +1810,11 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			mi.return_val.type = Variant::INT;
 			return mi;
 		} break;
-
+		case IS_INSTANCE_VALID: {
+			MethodInfo mi("is_instance_valid", PropertyInfo(Variant::OBJECT, "instance"));
+			mi.return_val.type = Variant::BOOL;
+			return mi;
+		} break;
 		case FUNC_MAX: {
 
 			ERR_FAIL_V(MethodInfo());
diff --git a/modules/gdscript/gdscript_functions.h b/modules/gdscript/gdscript_functions.h
index 1d540060845..c4731d17a46 100644
--- a/modules/gdscript/gdscript_functions.h
+++ b/modules/gdscript/gdscript_functions.h
@@ -113,6 +113,7 @@ public:
 		PRINT_STACK,
 		INSTANCE_FROM_ID,
 		LEN,
+		IS_INSTANCE_VALID,
 		FUNC_MAX
 
 	};