Merge pull request #105020 from YYF233333/opt_get_inheriters

Repiteo · Repiteo · commit 4b36c0491edc · 2025-04-04T17:40:59.000-05:00
Optimize `ClassDB::get_inheriters_from_class`
diff --git a/core/core_bind.cpp b/core/core_bind.cpp
@@ -1437,8 +1437,8 @@ PackedStringArray ClassDB::get_class_list() const {
 }
 
 PackedStringArray ClassDB::get_inheriters_from_class(const StringName &p_class) const {
-	List<StringName> classes;
-	::ClassDB::get_inheriters_from_class(p_class, &classes);
+	LocalVector<StringName> classes;
+	::ClassDB::get_inheriters_from_class(p_class, classes);
 
 	PackedStringArray ret;
 	ret.resize(classes.size());
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp
@@ -281,12 +281,12 @@ void ClassDB::get_extension_class_list(const Ref<GDExtension> &p_extension, List
 }
 #endif
 
-void ClassDB::get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) {
+void ClassDB::get_inheriters_from_class(const StringName &p_class, LocalVector<StringName> &p_classes) {
 	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
 		if (E.key != p_class && _is_parent_class(E.key, p_class)) {
-			p_classes->push_back(E.key);
+			p_classes.push_back(E.key);
 		}
 	}
 }
diff --git a/core/object/class_db.h b/core/object/class_db.h
@@ -311,7 +311,7 @@ class ClassDB {
 	static void get_extension_class_list(const Ref<GDExtension> &p_extension, List<StringName> *p_classes);
 	static ObjectGDExtension *get_placeholder_extension(const StringName &p_class);
 #endif
-	static void get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
+	static void get_inheriters_from_class(const StringName &p_class, LocalVector<StringName> &p_classes);
 	static void get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
 	static StringName get_parent_class_nocheck(const StringName &p_class);
 	static bool get_inheritance_chain_nocheck(const StringName &p_class, Vector<StringName> &r_result);
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp
@@ -974,8 +974,8 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	effect_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Don't translate class names.
 	effect_options->connect("index_pressed", callable_mp(this, &EditorAudioBus::_effect_add));
 	add_child(effect_options);
-	List<StringName> effect_list;
-	ClassDB::get_inheriters_from_class("AudioEffect", &effect_list);
+	LocalVector<StringName> effect_list;
+	ClassDB::get_inheriters_from_class("AudioEffect", effect_list);
 	effect_list.sort_custom<StringName::AlphCompare>();
 	for (const StringName &E : effect_list) {
 		if (!ClassDB::can_instantiate(E) || ClassDB::is_virtual(E)) {
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
@@ -607,8 +607,8 @@ static void _add_allowed_type(const StringName &p_type, List<StringName> *p_vect
 			p_vector->push_back(p_type);
 		}
 
-		List<StringName> inheriters;
-		ClassDB::get_inheriters_from_class(p_type, &inheriters);
+		LocalVector<StringName> inheriters;
+		ClassDB::get_inheriters_from_class(p_type, inheriters);
 		for (const StringName &S : inheriters) {
 			_add_allowed_type(S, p_vector);
 		}
diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp
@@ -1531,8 +1531,8 @@ ProjectExportDialog::ProjectExportDialog() {
 	resources_vb->add_child(server_strip_message);
 
 	{
-		List<StringName> resource_names;
-		ClassDB::get_inheriters_from_class("Resource", &resource_names);
+		LocalVector<StringName> resource_names;
+		ClassDB::get_inheriters_from_class("Resource", resource_names);
 
 		PackedStringArray strippable;
 		for (const StringName &resource_name : resource_names) {
diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp
@@ -1839,7 +1839,7 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
 }
 
 bool SceneTreeEditor::_is_script_type(const StringName &p_type) const {
-	return (script_types->find(p_type));
+	return (script_types->has(p_type));
 }
 
 bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
@@ -2144,8 +2144,8 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope
 	ask_before_revoke_checkbox->set_tooltip_text(TTR("This dialog can also be enabled/disabled in the Editor Settings: Docks > Scene Tree > Ask Before Revoking Unique Name."));
 	vb->add_child(ask_before_revoke_checkbox);
 
-	script_types = memnew(List<StringName>);
-	ClassDB::get_inheriters_from_class("Script", script_types);
+	script_types = memnew(LocalVector<StringName>);
+	ClassDB::get_inheriters_from_class("Script", *script_types);
 }
 
 SceneTreeEditor::~SceneTreeEditor() {
diff --git a/editor/gui/scene_tree_editor.h b/editor/gui/scene_tree_editor.h
@@ -212,7 +212,7 @@ class SceneTreeEditor : public Control {
 
 	Timer *update_timer = nullptr;
 
-	List<StringName> *script_types;
+	LocalVector<StringName> *script_types;
 	bool _is_script_type(const StringName &p_type) const;
 
 	Vector<StringName> valid_types;
diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp
@@ -76,8 +76,8 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 			animations_menu->clear();
 			animations_to_add.clear();
 
-			List<StringName> classes;
-			ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+			LocalVector<StringName> classes;
+			ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 			classes.sort_custom<StringName::AlphCompare>();
 
 			menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp
@@ -119,10 +119,10 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 			menu->clear(false);
 			animations_menu->clear();
 			animations_to_add.clear();
-			List<StringName> classes;
+			LocalVector<StringName> classes;
 			classes.sort_custom<StringName::AlphCompare>();
 
-			ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+			ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 			menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
 
 			List<StringName> names;
diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp
@@ -631,8 +631,8 @@ void AnimationNodeStateMachineEditor::_open_menu(const Vector2 &p_position) {
 		}
 	}
 
-	List<StringName> classes;
-	ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+	LocalVector<StringName> classes;
+	ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 	classes.sort_custom<StringName::AlphCompare>();
 
 	for (const StringName &class_name : classes) {
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
@@ -921,8 +921,8 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
 		node.insert_text = node.display.quote(p_quote_style);
 		r_result.insert(node.display, node);
 
-		List<StringName> native_classes;
-		ClassDB::get_inheriters_from_class("Node", &native_classes);
+		LocalVector<StringName> native_classes;
+		ClassDB::get_inheriters_from_class("Node", native_classes);
 		for (const StringName &E : native_classes) {
 			if (!ClassDB::is_class_exposed(E)) {
 				continue;

Original file line number	Diff line number	Diff line change
`@@ -1437,8 +1437,8 @@ PackedStringArray ClassDB::get_class_list() const {`
`1437`	`1437`	`}`
`1438`	`1438`
`1439`	`1439`	`PackedStringArray ClassDB::get_inheriters_from_class(const StringName &p_class) const {`
`1440`		`- List<StringName> classes;`
`1441`		`- ::ClassDB::get_inheriters_from_class(p_class, &classes);`
	`1440`	`+ LocalVector<StringName> classes;`
	`1441`	`+ ::ClassDB::get_inheriters_from_class(p_class, classes);`
`1442`	`1442`
`1443`	`1443`	`PackedStringArray ret;`
`1444`	`1444`	`ret.resize(classes.size());`
Original file line number	Diff line number	Diff line change
`@@ -281,12 +281,12 @@ void ClassDB::get_extension_class_list(const Ref<GDExtension> &p_extension, List`
`281`	`281`	`}`
`282`	`282`	`#endif`
`283`	`283`
`284`		`-void ClassDB::get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) {`
	`284`	`+void ClassDB::get_inheriters_from_class(const StringName &p_class, LocalVector<StringName> &p_classes) {`
`285`	`285`	`Locker::Lock lock(Locker::STATE_READ);`
`286`	`286`
`287`	`287`	`for (const KeyValue<StringName, ClassInfo> &E : classes) {`
`288`	`288`	`if (E.key != p_class && _is_parent_class(E.key, p_class)) {`
`289`		`- p_classes->push_back(E.key);`
	`289`	`+ p_classes.push_back(E.key);`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -607,8 +607,8 @@ static void _add_allowed_type(const StringName &p_type, List<StringName> *p_vect`
`607`	`607`	`p_vector->push_back(p_type);`
`608`	`608`	`}`
`609`	`609`
`610`		`- List<StringName> inheriters;`
`611`		`- ClassDB::get_inheriters_from_class(p_type, &inheriters);`
	`610`	`+ LocalVector<StringName> inheriters;`
	`611`	`+ ClassDB::get_inheriters_from_class(p_type, inheriters);`
`612`	`612`	`for (const StringName &S : inheriters) {`
`613`	`613`	`_add_allowed_type(S, p_vector);`
`614`	`614`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1531,8 +1531,8 @@ ProjectExportDialog::ProjectExportDialog() {`
`1531`	`1531`	`resources_vb->add_child(server_strip_message);`
`1532`	`1532`
`1533`	`1533`	`{`
`1534`		`- List<StringName> resource_names;`
`1535`		`- ClassDB::get_inheriters_from_class("Resource", &resource_names);`
	`1534`	`+ LocalVector<StringName> resource_names;`
	`1535`	`+ ClassDB::get_inheriters_from_class("Resource", resource_names);`
`1536`	`1536`
`1537`	`1537`	`PackedStringArray strippable;`
`1538`	`1538`	`for (const StringName &resource_name : resource_names) {`
Original file line number	Diff line number	Diff line change
`@@ -1839,7 +1839,7 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from`
`1839`	`1839`	`}`
`1840`	`1840`
`1841`	`1841`	`bool SceneTreeEditor::_is_script_type(const StringName &p_type) const {`
`1842`		`- return (script_types->find(p_type));`
	`1842`	`+ return (script_types->has(p_type));`
`1843`	`1843`	`}`
`1844`	`1844`
`1845`	`1845`	`bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {`
`@@ -2144,8 +2144,8 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope`
`2144`	`2144`	`ask_before_revoke_checkbox->set_tooltip_text(TTR("This dialog can also be enabled/disabled in the Editor Settings: Docks > Scene Tree > Ask Before Revoking Unique Name."));`
`2145`	`2145`	`vb->add_child(ask_before_revoke_checkbox);`
`2146`	`2146`
`2147`		`- script_types = memnew(List<StringName>);`
`2148`		`- ClassDB::get_inheriters_from_class("Script", script_types);`
	`2147`	`+ script_types = memnew(LocalVector<StringName>);`
	`2148`	`+ ClassDB::get_inheriters_from_class("Script", *script_types);`
`2149`	`2149`	`}`
`2150`	`2150`
`2151`	`2151`	`SceneTreeEditor::~SceneTreeEditor() {`
Original file line number	Diff line number	Diff line change
`@@ -631,8 +631,8 @@ void AnimationNodeStateMachineEditor::_open_menu(const Vector2 &p_position) {`
`631`	`631`	`}`
`632`	`632`	`}`
`633`	`633`
`634`		`- List<StringName> classes;`
`635`		`- ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);`
	`634`	`+ LocalVector<StringName> classes;`
	`635`	`+ ClassDB::get_inheriters_from_class("AnimationRootNode", classes);`
`636`	`636`	`classes.sort_custom<StringName::AlphCompare>();`
`637`	`637`
`638`	`638`	`for (const StringName &class_name : classes) {`