Merge pull request #107868 from lawnjelly/quick_ancestry4

Repiteo · Repiteo · commit 149a4b4ca12e · 2025-09-20T13:41:39.000-05:00
Provide quick access to `Object` ancestry
diff --git a/core/io/resource.cpp b/core/io/resource.cpp
@@ -758,7 +758,9 @@ void Resource::_bind_methods() {
 }
 
 Resource::Resource() :
-		remapped_list(this) {}
+		remapped_list(this) {
+	_define_ancestry(AncestralClass::RESOURCE);
+}
 
 Resource::~Resource() {
 	if (unlikely(path_cache.is_empty())) {
diff --git a/core/object/object.cpp b/core/object/object.cpp
@@ -2228,9 +2228,20 @@ void Object::reset_internal_extension(ObjectGDExtension *p_extension) {
 #endif
 
 void Object::_construct_object(bool p_reference) {
-	type_is_reference = p_reference;
+	_block_signals = false;
+	_can_translate = true;
+	_emitting = false;
+
+	// ObjectDB::add_instance relies on AncestralClass::REF_COUNTED
+	// being already set in the case of references.
+	_ancestry = p_reference ? (uint32_t)AncestralClass::REF_COUNTED : 0;
+
 	_instance_id = ObjectDB::add_instance(this);
 
+#ifdef TOOLS_ENABLED
+	_edited = false;
+#endif
+
 #ifdef DEBUG_ENABLED
 	_lock_index.init(1);
 #endif
diff --git a/core/object/object.h b/core/object/object.h
@@ -582,6 +582,29 @@ class Object {
 		CONNECT_INHERITED = 32, // Used in editor builds.
 	};
 
+	// Store on each object a bitfield to quickly test whether it is derived from some "key" classes
+	// that are commonly tested in performance sensitive code.
+	// Ensure unsigned to bitpack.
+	enum class AncestralClass : unsigned int {
+		REF_COUNTED = 1 << 0,
+		NODE = 1 << 1,
+		RESOURCE = 1 << 2,
+		SCRIPT = 1 << 3,
+
+		CANVAS_ITEM = 1 << 4,
+		CONTROL = 1 << 5,
+		NODE_2D = 1 << 6,
+		COLLISION_OBJECT_2D = 1 << 7,
+		AREA_2D = 1 << 8,
+
+		NODE_3D = 1 << 9,
+		VISUAL_INSTANCE_3D = 1 << 10,
+		GEOMETRY_INSTANCE_3D = 1 << 11,
+		COLLISION_OBJECT_3D = 1 << 12,
+		PHYSICS_BODY_3D = 1 << 13,
+		MESH_INSTANCE_3D = 1 << 14,
+	};
+
 	struct Connection {
 		::Signal signal;
 		Callable callable;
@@ -623,16 +646,19 @@ class Object {
 #ifdef DEBUG_ENABLED
 	SafeRefCount _lock_index;
 #endif // DEBUG_ENABLED
-	bool _block_signals = false;
 	int _predelete_ok = 0;
 	ObjectID _instance_id;
 	bool _predelete();
 	void _initialize();
 	void _postinitialize();
-	bool _can_translate = true;
-	bool _emitting = false;
+
+	uint32_t _ancestry : 15;
+
+	bool _block_signals : 1;
+	bool _can_translate : 1;
+	bool _emitting : 1;
 #ifdef TOOLS_ENABLED
-	bool _edited = false;
+	bool _edited : 1;
 	uint32_t _edited_version = 0;
 	HashSet<String> editor_section_folding;
 #endif
@@ -658,7 +684,6 @@ class Object {
 	_FORCE_INLINE_ void _construct_object(bool p_reference);
 
 	friend class RefCounted;
-	bool type_is_reference = false;
 
 	BinaryMutex _instance_binding_mutex;
 	struct InstanceBinding {
@@ -764,6 +789,7 @@ class Object {
 	static void _get_property_list_from_classdb(const StringName &p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator);
 
 	bool _disconnect(const StringName &p_signal, const Callable &p_callable, bool p_force = false);
+	void _define_ancestry(AncestralClass p_class) { _ancestry |= (uint32_t)p_class; }
 
 	virtual bool _uses_signal_mutex() const;
 
@@ -838,6 +864,8 @@ class Object {
 	}
 	virtual bool is_class_ptr(void *p_ptr) const { return get_class_ptr_static() == p_ptr; }
 
+	bool has_ancestry(AncestralClass p_class) const { return _ancestry & (uint32_t)p_class; }
+
 	const StringName &get_class_name() const;
 
 	StringName get_class_name_for_extension(const GDExtension *p_library) const;
@@ -996,7 +1024,7 @@ class Object {
 
 	void clear_internal_resource_paths();
 
-	_ALWAYS_INLINE_ bool is_ref_counted() const { return type_is_reference; }
+	_ALWAYS_INLINE_ bool is_ref_counted() const { return has_ancestry(AncestralClass::REF_COUNTED); }
 
 	void cancel_free();
 
diff --git a/core/object/ref_counted.cpp b/core/object/ref_counted.cpp
@@ -95,6 +95,7 @@ bool RefCounted::unreference() {
 
 RefCounted::RefCounted() :
 		Object(true) {
+	_define_ancestry(AncestralClass::REF_COUNTED);
 	refcount.init();
 	refcount_init.init();
 }
diff --git a/core/object/script_language.h b/core/object/script_language.h
@@ -197,7 +197,9 @@ class Script : public Resource {
 
 	virtual const Variant get_rpc_config() const = 0;
 
-	Script() {}
+	Script() {
+		_define_ancestry(AncestralClass::SCRIPT);
+	}
 };
 
 class ScriptLanguage : public Object {
diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp
@@ -510,3 +510,7 @@ void Node2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "global_skew", PROPERTY_HINT_NONE, "radians_as_degrees", PROPERTY_USAGE_NONE), "set_global_skew", "get_global_skew");
 	ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "global_transform", PROPERTY_HINT_NONE, "suffix:px", PROPERTY_USAGE_NONE), "set_global_transform", "get_global_transform");
 }
+
+Node2D::Node2D() {
+	_define_ancestry(AncestralClass::NODE_2D);
+}
diff --git a/scene/2d/node_2d.h b/scene/2d/node_2d.h
@@ -115,4 +115,6 @@ class Node2D : public CanvasItem {
 	Transform2D get_relative_transform_to_parent(const Node *p_parent) const;
 
 	Transform2D get_transform() const override;
+
+	Node2D();
 };
diff --git a/scene/2d/physics/area_2d.cpp b/scene/2d/physics/area_2d.cpp
@@ -678,6 +678,8 @@ void Area2D::_bind_methods() {
 
 Area2D::Area2D() :
 		CollisionObject2D(PhysicsServer2D::get_singleton()->area_create(), true) {
+	_define_ancestry(AncestralClass::AREA_2D);
+
 	set_gravity(980);
 	set_gravity_direction(Vector2(0, 1));
 	set_monitoring(true);
diff --git a/scene/2d/physics/collision_object_2d.cpp b/scene/2d/physics/collision_object_2d.cpp
@@ -655,6 +655,8 @@ void CollisionObject2D::_bind_methods() {
 }
 
 CollisionObject2D::CollisionObject2D(RID p_rid, bool p_area) {
+	_define_ancestry(AncestralClass::COLLISION_OBJECT_2D);
+
 	rid = p_rid;
 	area = p_area;
 	pickable = true;
@@ -672,6 +674,7 @@ CollisionObject2D::CollisionObject2D(RID p_rid, bool p_area) {
 }
 
 CollisionObject2D::CollisionObject2D() {
+	_define_ancestry(AncestralClass::COLLISION_OBJECT_2D);
 	//owner=
 
 	set_notify_transform(true);
diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp
@@ -925,6 +925,7 @@ void MeshInstance3D::_bind_methods() {
 }
 
 MeshInstance3D::MeshInstance3D() {
+	_define_ancestry(AncestralClass::MESH_INSTANCE_3D);
 }
 
 MeshInstance3D::~MeshInstance3D() {
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp
@@ -1546,6 +1546,8 @@ void Node3D::_bind_methods() {
 
 Node3D::Node3D() :
 		xform_change(this), _client_physics_interpolation_node_3d_list(this) {
+	_define_ancestry(AncestralClass::NODE_3D);
+
 	// Default member initializer for bitfield is a C++20 extension, so:
 
 	data.top_level = false;
diff --git a/scene/3d/physics/collision_object_3d.cpp b/scene/3d/physics/collision_object_3d.cpp
@@ -746,13 +746,17 @@ PackedStringArray CollisionObject3D::get_configuration_warnings() const {
 }
 
 CollisionObject3D::CollisionObject3D() {
+	_define_ancestry(AncestralClass::COLLISION_OBJECT_3D);
+
 	set_notify_transform(true);
 	//owner=
 
 	//set_transform_notify(true);
 }
 
 CollisionObject3D::~CollisionObject3D() {
+	_define_ancestry(AncestralClass::COLLISION_OBJECT_3D);
+
 	ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
 	PhysicsServer3D::get_singleton()->free(rid);
 }
diff --git a/scene/3d/physics/physics_body_3d.cpp b/scene/3d/physics/physics_body_3d.cpp
@@ -220,6 +220,10 @@ PackedStringArray PhysicsBody3D::get_configuration_warnings() const {
 	return warnings;
 }
 
+PhysicsBody3D::PhysicsBody3D() {
+	_define_ancestry(AncestralClass::PHYSICS_BODY_3D);
+}
+
 ///////////////////////////////////////
 
 //so, if you pass 45 as limit, avoid numerical precision errors when angle is 45.
diff --git a/scene/3d/physics/physics_body_3d.h b/scene/3d/physics/physics_body_3d.h
@@ -65,4 +65,6 @@ class PhysicsBody3D : public CollisionObject3D {
 	TypedArray<PhysicsBody3D> get_collision_exceptions();
 	void add_collision_exception_with(Node *p_node); //must be physicsbody
 	void remove_collision_exception_with(Node *p_node);
+
+	PhysicsBody3D();
 };
diff --git a/scene/3d/visual_instance_3d.cpp b/scene/3d/visual_instance_3d.cpp
@@ -202,6 +202,8 @@ RID VisualInstance3D::get_base() const {
 }
 
 VisualInstance3D::VisualInstance3D() {
+	_define_ancestry(AncestralClass::VISUAL_INSTANCE_3D);
+
 	instance = RenderingServer::get_singleton()->instance_create();
 	RenderingServer::get_singleton()->instance_attach_object_instance_id(instance, get_instance_id());
 	set_notify_transform(true);
@@ -643,6 +645,7 @@ void GeometryInstance3D::_bind_methods() {
 }
 
 GeometryInstance3D::GeometryInstance3D() {
+	_define_ancestry(AncestralClass::GEOMETRY_INSTANCE_3D);
 }
 
 GeometryInstance3D::~GeometryInstance3D() {
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
@@ -4392,6 +4392,8 @@ void Control::_bind_methods() {
 }
 
 Control::Control() {
+	_define_ancestry(AncestralClass::CONTROL);
+
 	data.theme_owner = memnew(ThemeOwner(this));
 
 	set_physics_interpolation_mode(Node::PHYSICS_INTERPOLATION_MODE_OFF);
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
@@ -1755,6 +1755,8 @@ CanvasItem::TextureRepeat CanvasItem::get_texture_repeat_in_tree() const {
 
 CanvasItem::CanvasItem() :
 		xform_change(this) {
+	_define_ancestry(AncestralClass::CANVAS_ITEM);
+
 	canvas_item = RenderingServer::get_singleton()->canvas_item_create();
 }
 
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
@@ -4041,6 +4041,8 @@ String Node::_get_name_num_separator() {
 }
 
 Node::Node() {
+	_define_ancestry(AncestralClass::NODE);
+
 	orphan_node_count++;
 
 	// Default member initializer for bitfield is a C++20 extension, so:

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,9 @@ void Resource::_bind_methods() {`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`Resource::Resource() :`
`761`		`- remapped_list(this) {}`
	`761`	`+ remapped_list(this) {`
	`762`	`+ _define_ancestry(AncestralClass::RESOURCE);`
	`763`	`+}`
`762`	`764`
`763`	`765`	`Resource::~Resource() {`
`764`	`766`	`if (unlikely(path_cache.is_empty())) {`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ bool RefCounted::unreference() {`
`95`	`95`
`96`	`96`	`RefCounted::RefCounted() :`
`97`	`97`	`Object(true) {`
	`98`	`+ _define_ancestry(AncestralClass::REF_COUNTED);`
`98`	`99`	`refcount.init();`
`99`	`100`	`refcount_init.init();`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -510,3 +510,7 @@ void Node2D::_bind_methods() {`
`510`	`510`	`ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "global_skew", PROPERTY_HINT_NONE, "radians_as_degrees", PROPERTY_USAGE_NONE), "set_global_skew", "get_global_skew");`
`511`	`511`	`ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "global_transform", PROPERTY_HINT_NONE, "suffix:px", PROPERTY_USAGE_NONE), "set_global_transform", "get_global_transform");`
`512`	`512`	`}`
	`513`	`+`
	`514`	`+Node2D::Node2D() {`
	`515`	`+ _define_ancestry(AncestralClass::NODE_2D);`
	`516`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,8 @@ void CollisionObject2D::_bind_methods() {`
`655`	`655`	`}`
`656`	`656`
`657`	`657`	`CollisionObject2D::CollisionObject2D(RID p_rid, bool p_area) {`
	`658`	`+ _define_ancestry(AncestralClass::COLLISION_OBJECT_2D);`
	`659`	`+`
`658`	`660`	`rid = p_rid;`
`659`	`661`	`area = p_area;`
`660`	`662`	`pickable = true;`
`@@ -672,6 +674,7 @@ CollisionObject2D::CollisionObject2D(RID p_rid, bool p_area) {`
`672`	`674`	`}`
`673`	`675`
`674`	`676`	`CollisionObject2D::CollisionObject2D() {`
	`677`	`+ _define_ancestry(AncestralClass::COLLISION_OBJECT_2D);`
`675`	`678`	`//owner=`
`676`	`679`
`677`	`680`	`set_notify_transform(true);`
Original file line number	Diff line number	Diff line change
`@@ -925,6 +925,7 @@ void MeshInstance3D::_bind_methods() {`
`925`	`925`	`}`
`926`	`926`
`927`	`927`	`MeshInstance3D::MeshInstance3D() {`
	`928`	`+ _define_ancestry(AncestralClass::MESH_INSTANCE_3D);`
`928`	`929`	`}`
`929`	`930`
`930`	`931`	`MeshInstance3D::~MeshInstance3D() {`