1 files changed, 15 insertions, 11 deletions

diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp
index bd98d66fcc..271296c2f9 100644
--- a/modules/gdscript/gdscript_cache.cpp
+++ b/modules/gdscript/gdscript_cache.cpp
@@ -146,9 +146,7 @@ String GDScriptCache::get_source_code(const String &p_path) {
 	Vector<uint8_t> source_file;
 	Error err;
 	Ref<FileAccess> f = FileAccess::open(p_path, FileAccess::READ, &err);
-	if (err) {
-		ERR_FAIL_COND_V(err, "");
-	}
+	ERR_FAIL_COND_V(err, "");
 
 	uint64_t len = f->get_length();
 	source_file.resize(len + 1);
@@ -157,7 +155,7 @@ String GDScriptCache::get_source_code(const String &p_path) {
 	source_file.write[len] = 0;
 
 	String source;
-	if (source.parse_utf8((const char *)source_file.ptr())) {
+	if (source.parse_utf8((const char *)source_file.ptr()) != OK) {
 		ERR_FAIL_V_MSG("", "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
 	}
 	return source;
@@ -185,20 +183,26 @@ Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, const Stri
 	return script;
 }
 
-Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_error, const String &p_owner) {
+Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_error, const String &p_owner, bool p_update_from_disk) {
 	MutexLock lock(singleton->lock);
 
 	if (!p_owner.is_empty()) {
 		singleton->dependencies[p_owner].insert(p_path);
 	}
 
+	Ref<GDScript> script;
 	r_error = OK;
 	if (singleton->full_gdscript_cache.has(p_path)) {
-		return singleton->full_gdscript_cache[p_path];
+		script = Ref<GDScript>(singleton->full_gdscript_cache[p_path]);
+		if (!p_update_from_disk) {
+			return script;
+		}
 	}
 
-	Ref<GDScript> script = get_shallow_script(p_path);
-	ERR_FAIL_COND_V(script.is_null(), Ref<GDScript>());
+	if (script.is_null()) {
+		script = get_shallow_script(p_path);
+		ERR_FAIL_COND_V(script.is_null(), Ref<GDScript>());
+	}
 
 	r_error = script->load_source_code(p_path);
 
@@ -223,13 +227,13 @@ Error GDScriptCache::finish_compiling(const String &p_owner) {
 	singleton->full_gdscript_cache[p_owner] = script.ptr();
 	singleton->shallow_gdscript_cache.erase(p_owner);
 
-	RBSet<String> depends = singleton->dependencies[p_owner];
+	HashSet<String> depends = singleton->dependencies[p_owner];
 
 	Error err = OK;
-	for (const RBSet<String>::Element *E = depends.front(); E != nullptr; E = E->next()) {
+	for (const String &E : depends) {
 		Error this_err = OK;
 		// No need to save the script. We assume it's already referenced in the owner.
-		get_full_script(E->get(), this_err);
+		get_full_script(E, this_err);
 
 		if (this_err != OK) {
 			err = this_err;