Merge pull request #95115 from rune-scape/fix-invalidated-parser

akien-mga · akien-mga · commit 79ae9524ef11 · 2024-08-06T12:31:53.000+02:00
GDScript: Fix unnecessary calls to `remove_parser`
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
@@ -299,12 +299,14 @@ void GDScriptAnalyzer::get_class_node_current_scope_classes(GDScriptParser::Clas
 
 	// Prioritize node base type over its outer class
 	if (p_node->base_type.class_type != nullptr) {
-		ensure_cached_parser_for_class(p_node->base_type.class_type, p_node, vformat(R"(Trying to fetch classes in the current scope: base class of "%s")", p_node->fqcn), p_source);
+		// TODO: 'ensure_cached_external_parser_for_class()' is only necessary because 'resolve_class_inheritance()' is not getting called here.
+		ensure_cached_external_parser_for_class(p_node->base_type.class_type, p_node, "Trying to fetch classes in the current scope", p_source);
 		get_class_node_current_scope_classes(p_node->base_type.class_type, p_list, p_source);
 	}
 
 	if (p_node->outer != nullptr) {
-		ensure_cached_parser_for_class(p_node->outer, p_node, vformat(R"(Trying to fetch classes in the current scope: outer class of "%s")", p_node->fqcn), p_source);
+		// TODO: 'ensure_cached_external_parser_for_class()' is only necessary because 'resolve_class_inheritance()' is not getting called here.
+		ensure_cached_external_parser_for_class(p_node->outer, p_node, "Trying to fetch classes in the current scope", p_source);
 		get_class_node_current_scope_classes(p_node->outer, p_list, p_source);
 	}
 }
@@ -314,10 +316,10 @@ Error GDScriptAnalyzer::resolve_class_inheritance(GDScriptParser::ClassNode *p_c
 		p_source = p_class;
 	}
 
-	Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class inheritance of "%s")", p_class->fqcn), p_source);
+	Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class inheritance", p_source);
 	Finally finally([&]() {
 		for (GDScriptParser::ClassNode *look_class = p_class; look_class != nullptr; look_class = look_class->base_type.class_type) {
-			ensure_cached_parser_for_class(look_class->base_type.class_type, look_class, vformat(R"(Trying to resolve class inheritance of "%s")", p_class->fqcn), p_source);
+			ensure_cached_external_parser_for_class(look_class->base_type.class_type, look_class, "Trying to resolve class inheritance", p_source);
 		}
 	});
 
@@ -888,12 +890,12 @@ void GDScriptAnalyzer::resolve_class_member(GDScriptParser::ClassNode *p_class,
 		p_source = member.get_source_node();
 	}
 
-	Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class member "%s" of "%s")", member.get_name(), p_class->fqcn), p_source);
+	Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class member", p_source);
 	Finally finally([&]() {
-		ensure_cached_parser_for_class(member.get_datatype().class_type, p_class, vformat(R"(Trying to resolve datatype of class member "%s" of "%s")", member.get_name(), p_class->fqcn), p_source);
+		ensure_cached_external_parser_for_class(member.get_datatype().class_type, p_class, "Trying to resolve datatype of class member", p_source);
 		GDScriptParser::DataType member_type = member.get_datatype();
 		if (member_type.has_container_element_type(0)) {
-			ensure_cached_parser_for_class(member_type.get_container_element_type(0).class_type, p_class, vformat(R"(Trying to resolve datatype of class member "%s" of "%s")", member.get_name(), p_class->fqcn), p_source);
+			ensure_cached_external_parser_for_class(member_type.get_container_element_type(0).class_type, p_class, "Trying to resolve datatype of class member", p_source);
 		}
 	});
 
@@ -1181,7 +1183,7 @@ void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_clas
 		p_source = p_class;
 	}
 
-	Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class interface of "%s")", p_class->fqcn), p_source);
+	Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class interface", p_source);
 
 	if (!p_class->resolved_interface) {
 #ifdef DEBUG_ENABLED
@@ -1271,7 +1273,7 @@ void GDScriptAnalyzer::resolve_class_body(GDScriptParser::ClassNode *p_class, co
 		p_source = p_class;
 	}
 
-	Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class body of "%s")", p_class->fqcn), p_source);
+	Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class body", p_source);
 
 	if (p_class->resolved_body) {
 		return;
@@ -3654,19 +3656,19 @@ GDScriptParser::DataType GDScriptAnalyzer::make_global_class_meta_type(const Str
 	}
 }
 
-Ref<GDScriptParserRef> GDScriptAnalyzer::ensure_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, const GDScriptParser::ClassNode *p_from_class, const String &p_context, const GDScriptParser::Node *p_source) {
+Ref<GDScriptParserRef> GDScriptAnalyzer::ensure_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, const GDScriptParser::ClassNode *p_from_class, const char *p_context, const GDScriptParser::Node *p_source) {
 	if (p_class == nullptr) {
 		return nullptr;
 	}
 
-	if (parser->has_class(p_class)) {
-		return nullptr;
-	}
-
 	if (HashMap<const GDScriptParser::ClassNode *, Ref<GDScriptParserRef>>::Iterator E = external_class_parser_cache.find(p_class)) {
 		return E->value;
 	}
 
+	if (parser->has_class(p_class)) {
+		return nullptr;
+	}
+
 	if (p_from_class == nullptr) {
 		p_from_class = parser->head;
 	}
@@ -3676,39 +3678,39 @@ Ref<GDScriptParserRef> GDScriptAnalyzer::ensure_cached_parser_for_class(const GD
 	Ref<GDScriptParserRef> parser_ref;
 	for (const GDScriptParser::ClassNode *look_class = p_from_class; look_class != nullptr; look_class = look_class->base_type.class_type) {
 		if (parser->has_class(look_class)) {
-			parser_ref = find_cached_parser_for_class(p_class, parser);
+			parser_ref = find_cached_external_parser_for_class(p_class, parser);
 			if (parser_ref.is_valid()) {
 				break;
 			}
 		}
 
 		if (HashMap<const GDScriptParser::ClassNode *, Ref<GDScriptParserRef>>::Iterator E = external_class_parser_cache.find(look_class)) {
-			parser_ref = find_cached_parser_for_class(p_class, E->value);
+			parser_ref = find_cached_external_parser_for_class(p_class, E->value);
 			if (parser_ref.is_valid()) {
 				break;
 			}
 		}
 
 		String look_class_script_path = look_class->get_datatype().script_path;
 		if (HashMap<String, Ref<GDScriptParserRef>>::Iterator E = parser->depended_parsers.find(look_class_script_path)) {
-			parser_ref = find_cached_parser_for_class(p_class, E->value);
+			parser_ref = find_cached_external_parser_for_class(p_class, E->value);
 			if (parser_ref.is_valid()) {
 				break;
 			}
 		}
 	}
 
 	if (parser_ref.is_null()) {
-		push_error(vformat(R"(Parser bug: Could not find external parser. (%s))", p_context), p_source);
-		// A null parser will be inserted into the cache and this error won't spam for the same class.
+		push_error(vformat(R"(Parser bug (please report): Could not find external parser for class "%s". (%s))", p_class->fqcn, p_context), p_source);
+		// A null parser will be inserted into the cache, so this error won't spam for the same class.
 		// This is ok, the values of external_class_parser_cache are not assumed to be valid references.
 	}
 
 	external_class_parser_cache.insert(p_class, parser_ref);
 	return parser_ref;
 }
 
-Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, const Ref<GDScriptParserRef> &p_dependant_parser) {
+Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, const Ref<GDScriptParserRef> &p_dependant_parser) {
 	if (p_dependant_parser.is_null()) {
 		return nullptr;
 	}
@@ -3729,10 +3731,10 @@ Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_parser_for_class(const GDSc
 
 	// Silently ensure it's parsed.
 	p_dependant_parser->raise_status(GDScriptParserRef::PARSED);
-	return find_cached_parser_for_class(p_class, p_dependant_parser->get_parser());
+	return find_cached_external_parser_for_class(p_class, p_dependant_parser->get_parser());
 }
 
-Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, GDScriptParser *p_dependant_parser) {
+Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, GDScriptParser *p_dependant_parser) {
 	if (p_dependant_parser == nullptr) {
 		return nullptr;
 	}
@@ -4474,7 +4476,11 @@ void GDScriptAnalyzer::reduce_preload(GDScriptParser::PreloadNode *p_preload) {
 	p_preload->is_constant = true;
 	p_preload->reduced_value = p_preload->resource;
 	p_preload->set_datatype(type_from_variant(p_preload->reduced_value, p_preload));
-	ensure_cached_parser_for_class(p_preload->get_datatype().class_type, nullptr, vformat(R"(Trying to resolve preload of "%s")", p_preload->resolved_path), p_preload);
+
+	// TODO: Not sure if this is necessary anymore.
+	// 'type_from_variant()' should call 'resolve_class_inheritance()' which would call 'ensure_cached_external_parser_for_class()'
+	// Better safe than sorry.
+	ensure_cached_external_parser_for_class(p_preload->get_datatype().class_type, nullptr, "Trying to resolve preload", p_preload);
 }
 
 void GDScriptAnalyzer::reduce_self(GDScriptParser::SelfNode *p_self) {
diff --git a/modules/gdscript/gdscript_analyzer.h b/modules/gdscript/gdscript_analyzer.h
@@ -145,9 +145,9 @@ class GDScriptAnalyzer {
 	void resolve_pending_lambda_bodies();
 	bool class_exists(const StringName &p_class) const;
 	void reduce_identifier_from_base_set_class(GDScriptParser::IdentifierNode *p_identifier, GDScriptParser::DataType p_identifier_datatype);
-	Ref<GDScriptParserRef> ensure_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, const GDScriptParser::ClassNode *p_from_class, const String &p_context, const GDScriptParser::Node *p_source);
-	Ref<GDScriptParserRef> find_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, const Ref<GDScriptParserRef> &p_dependant_parser);
-	Ref<GDScriptParserRef> find_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, GDScriptParser *p_dependant_parser);
+	Ref<GDScriptParserRef> ensure_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, const GDScriptParser::ClassNode *p_from_class, const char *p_context, const GDScriptParser::Node *p_source);
+	Ref<GDScriptParserRef> find_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, const Ref<GDScriptParserRef> &p_dependant_parser);
+	Ref<GDScriptParserRef> find_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, GDScriptParser *p_dependant_parser);
 	Ref<GDScript> get_depended_shallow_script(const String &p_path, Error &r_error);
 #ifdef DEBUG_ENABLED
 	void is_shadowing(GDScriptParser::IdentifierNode *p_identifier, const String &p_context, const bool p_in_local_scope);
diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp
@@ -135,8 +135,10 @@ void GDScriptParserRef::clear() {
 
 GDScriptParserRef::~GDScriptParserRef() {
 	clear();
+
 	if (!abandoned) {
-		GDScriptCache::remove_parser(path);
+		MutexLock lock(GDScriptCache::singleton->mutex);
+		GDScriptCache::singleton->parser_map.erase(path);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -299,12 +299,14 @@ void GDScriptAnalyzer::get_class_node_current_scope_classes(GDScriptParser::Clas`
`299`	`299`
`300`	`300`	`// Prioritize node base type over its outer class`
`301`	`301`	`if (p_node->base_type.class_type != nullptr) {`
`302`		`- ensure_cached_parser_for_class(p_node->base_type.class_type, p_node, vformat(R"(Trying to fetch classes in the current scope: base class of "%s")", p_node->fqcn), p_source);`
	`302`	`+ // TODO: 'ensure_cached_external_parser_for_class()' is only necessary because 'resolve_class_inheritance()' is not getting called here.`
	`303`	`+ ensure_cached_external_parser_for_class(p_node->base_type.class_type, p_node, "Trying to fetch classes in the current scope", p_source);`
`303`	`304`	`get_class_node_current_scope_classes(p_node->base_type.class_type, p_list, p_source);`
`304`	`305`	`}`
`305`	`306`
`306`	`307`	`if (p_node->outer != nullptr) {`
`307`		`- ensure_cached_parser_for_class(p_node->outer, p_node, vformat(R"(Trying to fetch classes in the current scope: outer class of "%s")", p_node->fqcn), p_source);`
	`308`	`+ // TODO: 'ensure_cached_external_parser_for_class()' is only necessary because 'resolve_class_inheritance()' is not getting called here.`
	`309`	`+ ensure_cached_external_parser_for_class(p_node->outer, p_node, "Trying to fetch classes in the current scope", p_source);`
`308`	`310`	`get_class_node_current_scope_classes(p_node->outer, p_list, p_source);`
`309`	`311`	`}`
`310`	`312`	`}`
`@@ -314,10 +316,10 @@ Error GDScriptAnalyzer::resolve_class_inheritance(GDScriptParser::ClassNode *p_c`
`314`	`316`	`p_source = p_class;`
`315`	`317`	`}`
`316`	`318`
`317`		`- Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class inheritance of "%s")", p_class->fqcn), p_source);`
	`319`	`+ Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class inheritance", p_source);`
`318`	`320`	`Finally finally([&]() {`
`319`	`321`	`for (GDScriptParser::ClassNode *look_class = p_class; look_class != nullptr; look_class = look_class->base_type.class_type) {`
`320`		`- ensure_cached_parser_for_class(look_class->base_type.class_type, look_class, vformat(R"(Trying to resolve class inheritance of "%s")", p_class->fqcn), p_source);`
	`322`	`+ ensure_cached_external_parser_for_class(look_class->base_type.class_type, look_class, "Trying to resolve class inheritance", p_source);`
`321`	`323`	`}`
`322`	`324`	`});`
`323`	`325`
`@@ -888,12 +890,12 @@ void GDScriptAnalyzer::resolve_class_member(GDScriptParser::ClassNode *p_class,`
`888`	`890`	`p_source = member.get_source_node();`
`889`	`891`	`}`
`890`	`892`
`891`		`- Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class member "%s" of "%s")", member.get_name(), p_class->fqcn), p_source);`
	`893`	`+ Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class member", p_source);`
`892`	`894`	`Finally finally([&]() {`
`893`		`- ensure_cached_parser_for_class(member.get_datatype().class_type, p_class, vformat(R"(Trying to resolve datatype of class member "%s" of "%s")", member.get_name(), p_class->fqcn), p_source);`
	`895`	`+ ensure_cached_external_parser_for_class(member.get_datatype().class_type, p_class, "Trying to resolve datatype of class member", p_source);`
`894`	`896`	`GDScriptParser::DataType member_type = member.get_datatype();`
`895`	`897`	`if (member_type.has_container_element_type(0)) {`
`896`		`- ensure_cached_parser_for_class(member_type.get_container_element_type(0).class_type, p_class, vformat(R"(Trying to resolve datatype of class member "%s" of "%s")", member.get_name(), p_class->fqcn), p_source);`
	`898`	`+ ensure_cached_external_parser_for_class(member_type.get_container_element_type(0).class_type, p_class, "Trying to resolve datatype of class member", p_source);`
`897`	`899`	`}`
`898`	`900`	`});`
`899`	`901`
`@@ -1181,7 +1183,7 @@ void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_clas`
`1181`	`1183`	`p_source = p_class;`
`1182`	`1184`	`}`
`1183`	`1185`
`1184`		`- Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class interface of "%s")", p_class->fqcn), p_source);`
	`1186`	`+ Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class interface", p_source);`
`1185`	`1187`
`1186`	`1188`	`if (!p_class->resolved_interface) {`
`1187`	`1189`	`#ifdef DEBUG_ENABLED`
`@@ -1271,7 +1273,7 @@ void GDScriptAnalyzer::resolve_class_body(GDScriptParser::ClassNode *p_class, co`
`1271`	`1273`	`p_source = p_class;`
`1272`	`1274`	`}`
`1273`	`1275`
`1274`		`- Ref<GDScriptParserRef> parser_ref = ensure_cached_parser_for_class(p_class, nullptr, vformat(R"(Trying to resolve class body of "%s")", p_class->fqcn), p_source);`
	`1276`	`+ Ref<GDScriptParserRef> parser_ref = ensure_cached_external_parser_for_class(p_class, nullptr, "Trying to resolve class body", p_source);`
`1275`	`1277`
`1276`	`1278`	`if (p_class->resolved_body) {`
`1277`	`1279`	`return;`
`@@ -3654,19 +3656,19 @@ GDScriptParser::DataType GDScriptAnalyzer::make_global_class_meta_type(const Str`
`3654`	`3656`	`}`
`3655`	`3657`	`}`
`3656`	`3658`
`3657`		`-Ref<GDScriptParserRef> GDScriptAnalyzer::ensure_cached_parser_for_class(const GDScriptParser::ClassNode p_class, const GDScriptParser::ClassNode p_from_class, const String &p_context, const GDScriptParser::Node *p_source) {`
	`3659`	`+Ref<GDScriptParserRef> GDScriptAnalyzer::ensure_cached_external_parser_for_class(const GDScriptParser::ClassNode p_class, const GDScriptParser::ClassNode p_from_class, const char p_context, const GDScriptParser::Node p_source) {`
`3658`	`3660`	`if (p_class == nullptr) {`
`3659`	`3661`	`return nullptr;`
`3660`	`3662`	`}`
`3661`	`3663`
`3662`		`- if (parser->has_class(p_class)) {`
`3663`		`- return nullptr;`
`3664`		`- }`
`3665`		`-`
`3666`	`3664`	`if (HashMap<const GDScriptParser::ClassNode *, Ref<GDScriptParserRef>>::Iterator E = external_class_parser_cache.find(p_class)) {`
`3667`	`3665`	`return E->value;`
`3668`	`3666`	`}`
`3669`	`3667`
	`3668`	`+ if (parser->has_class(p_class)) {`
	`3669`	`+ return nullptr;`
	`3670`	`+ }`
	`3671`	`+`
`3670`	`3672`	`if (p_from_class == nullptr) {`
`3671`	`3673`	`p_from_class = parser->head;`
`3672`	`3674`	`}`
`@@ -3676,39 +3678,39 @@ Ref<GDScriptParserRef> GDScriptAnalyzer::ensure_cached_parser_for_class(const GD`
`3676`	`3678`	`Ref<GDScriptParserRef> parser_ref;`
`3677`	`3679`	`for (const GDScriptParser::ClassNode *look_class = p_from_class; look_class != nullptr; look_class = look_class->base_type.class_type) {`
`3678`	`3680`	`if (parser->has_class(look_class)) {`
`3679`		`- parser_ref = find_cached_parser_for_class(p_class, parser);`
	`3681`	`+ parser_ref = find_cached_external_parser_for_class(p_class, parser);`
`3680`	`3682`	`if (parser_ref.is_valid()) {`
`3681`	`3683`	`break;`
`3682`	`3684`	`}`
`3683`	`3685`	`}`
`3684`	`3686`
`3685`	`3687`	`if (HashMap<const GDScriptParser::ClassNode *, Ref<GDScriptParserRef>>::Iterator E = external_class_parser_cache.find(look_class)) {`
`3686`		`- parser_ref = find_cached_parser_for_class(p_class, E->value);`
	`3688`	`+ parser_ref = find_cached_external_parser_for_class(p_class, E->value);`
`3687`	`3689`	`if (parser_ref.is_valid()) {`
`3688`	`3690`	`break;`
`3689`	`3691`	`}`
`3690`	`3692`	`}`
`3691`	`3693`
`3692`	`3694`	`String look_class_script_path = look_class->get_datatype().script_path;`
`3693`	`3695`	`if (HashMap<String, Ref<GDScriptParserRef>>::Iterator E = parser->depended_parsers.find(look_class_script_path)) {`
`3694`		`- parser_ref = find_cached_parser_for_class(p_class, E->value);`
	`3696`	`+ parser_ref = find_cached_external_parser_for_class(p_class, E->value);`
`3695`	`3697`	`if (parser_ref.is_valid()) {`
`3696`	`3698`	`break;`
`3697`	`3699`	`}`
`3698`	`3700`	`}`
`3699`	`3701`	`}`
`3700`	`3702`
`3701`	`3703`	`if (parser_ref.is_null()) {`
`3702`		`- push_error(vformat(R"(Parser bug: Could not find external parser. (%s))", p_context), p_source);`
`3703`		`- // A null parser will be inserted into the cache and this error won't spam for the same class.`
	`3704`	`+ push_error(vformat(R"(Parser bug (please report): Could not find external parser for class "%s". (%s))", p_class->fqcn, p_context), p_source);`
	`3705`	`+ // A null parser will be inserted into the cache, so this error won't spam for the same class.`
`3704`	`3706`	`// This is ok, the values of external_class_parser_cache are not assumed to be valid references.`
`3705`	`3707`	`}`
`3706`	`3708`
`3707`	`3709`	`external_class_parser_cache.insert(p_class, parser_ref);`
`3708`	`3710`	`return parser_ref;`
`3709`	`3711`	`}`
`3710`	`3712`
`3711`		`-Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_parser_for_class(const GDScriptParser::ClassNode *p_class, const Ref<GDScriptParserRef> &p_dependant_parser) {`
	`3713`	`+Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_external_parser_for_class(const GDScriptParser::ClassNode *p_class, const Ref<GDScriptParserRef> &p_dependant_parser) {`
`3712`	`3714`	`if (p_dependant_parser.is_null()) {`
`3713`	`3715`	`return nullptr;`
`3714`	`3716`	`}`
`@@ -3729,10 +3731,10 @@ Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_parser_for_class(const GDSc`
`3729`	`3731`
`3730`	`3732`	`// Silently ensure it's parsed.`
`3731`	`3733`	`p_dependant_parser->raise_status(GDScriptParserRef::PARSED);`
`3732`		`- return find_cached_parser_for_class(p_class, p_dependant_parser->get_parser());`
	`3734`	`+ return find_cached_external_parser_for_class(p_class, p_dependant_parser->get_parser());`
`3733`	`3735`	`}`
`3734`	`3736`
`3735`		`-Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_parser_for_class(const GDScriptParser::ClassNode p_class, GDScriptParser p_dependant_parser) {`
	`3737`	`+Ref<GDScriptParserRef> GDScriptAnalyzer::find_cached_external_parser_for_class(const GDScriptParser::ClassNode p_class, GDScriptParser p_dependant_parser) {`
`3736`	`3738`	`if (p_dependant_parser == nullptr) {`
`3737`	`3739`	`return nullptr;`
`3738`	`3740`	`}`
`@@ -4474,7 +4476,11 @@ void GDScriptAnalyzer::reduce_preload(GDScriptParser::PreloadNode *p_preload) {`
`4474`	`4476`	`p_preload->is_constant = true;`
`4475`	`4477`	`p_preload->reduced_value = p_preload->resource;`
`4476`	`4478`	`p_preload->set_datatype(type_from_variant(p_preload->reduced_value, p_preload));`
`4477`		`- ensure_cached_parser_for_class(p_preload->get_datatype().class_type, nullptr, vformat(R"(Trying to resolve preload of "%s")", p_preload->resolved_path), p_preload);`
	`4479`	`+`
	`4480`	`+ // TODO: Not sure if this is necessary anymore.`
	`4481`	`+ // 'type_from_variant()' should call 'resolve_class_inheritance()' which would call 'ensure_cached_external_parser_for_class()'`
	`4482`	`+ // Better safe than sorry.`
	`4483`	`+ ensure_cached_external_parser_for_class(p_preload->get_datatype().class_type, nullptr, "Trying to resolve preload", p_preload);`
`4478`	`4484`	`}`
`4479`	`4485`
`4480`	`4486`	`void GDScriptAnalyzer::reduce_self(GDScriptParser::SelfNode *p_self) {`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,10 @@ void GDScriptParserRef::clear() {`
`135`	`135`
`136`	`136`	`GDScriptParserRef::~GDScriptParserRef() {`
`137`	`137`	`clear();`
	`138`	`+`
`138`	`139`	`if (!abandoned) {`
`139`		`- GDScriptCache::remove_parser(path);`
	`140`	`+ MutexLock lock(GDScriptCache::singleton->mutex);`
	`141`	`+ GDScriptCache::singleton->parser_map.erase(path);`
`140`	`142`	`}`
`141`	`143`	`}`
`142`	`144`