1 files changed, 8 insertions, 12 deletions

diff --git a/modules/gdscript/gdscript_compiler.h b/modules/gdscript/gdscript_compiler.h
index 80fba6a934..157c801f56 100644
--- a/modules/gdscript/gdscript_compiler.h
+++ b/modules/gdscript/gdscript_compiler.h
@@ -31,7 +31,7 @@
 #ifndef GDSCRIPT_COMPILER_H
 #define GDSCRIPT_COMPILER_H
 
-#include "core/set.h"
+#include "core/templates/set.h"
 #include "gdscript.h"
 #include "gdscript_codegen.h"
 #include "gdscript_function.h"
@@ -51,12 +51,11 @@ class GDScriptCompiler {
 		GDScriptCodeGenerator *generator = nullptr;
 		Map<StringName, GDScriptCodeGenerator::Address> parameters;
 		Map<StringName, GDScriptCodeGenerator::Address> locals;
-		List<Set<StringName>> locals_in_scope;
+		List<Map<StringName, GDScriptCodeGenerator::Address>> locals_stack;
 
 		GDScriptCodeGenerator::Address add_local(const StringName &p_name, const GDScriptDataType &p_type) {
 			uint32_t addr = generator->add_local(p_name, p_type);
 			locals[p_name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::LOCAL_VARIABLE, addr, p_type);
-			locals_in_scope.back()->get().insert(p_name);
 			return locals[p_name];
 		}
 
@@ -84,7 +83,7 @@ class GDScriptCompiler {
 
 					Ref<Script> script = obj->get_script();
 					if (script.is_valid()) {
-						type.script_type = script;
+						type.script_type = script.ptr();
 						Ref<GDScript> gdscript = script;
 						if (gdscript.is_valid()) {
 							type.kind = GDScriptDataType::GDSCRIPT;
@@ -102,17 +101,14 @@ class GDScriptCompiler {
 		}
 
 		void start_block() {
-			Set<StringName> scope;
-			locals_in_scope.push_back(scope);
+			Map<StringName, GDScriptCodeGenerator::Address> old_locals = locals;
+			locals_stack.push_back(old_locals);
 			generator->start_block();
 		}
 
 		void end_block() {
-			Set<StringName> &scope = locals_in_scope.back()->get();
-			for (Set<StringName>::Element *E = scope.front(); E; E = E->next()) {
-				locals.erase(E->get());
-			}
-			locals_in_scope.pop_back();
+			locals = locals_stack.back()->get();
+			locals_stack.pop_back();
 			generator->end_block();
 		}
 	};
@@ -125,7 +121,7 @@ class GDScriptCompiler {
 	Error _create_binary_operator(CodeGen &codegen, const GDScriptParser::BinaryOpNode *on, Variant::Operator op, bool p_initializer = false, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
 	Error _create_binary_operator(CodeGen &codegen, const GDScriptParser::ExpressionNode *p_left_operand, const GDScriptParser::ExpressionNode *p_right_operand, Variant::Operator op, bool p_initializer = false, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
 
-	GDScriptDataType _gdtype_from_datatype(const GDScriptParser::DataType &p_datatype) const;
+	GDScriptDataType _gdtype_from_datatype(const GDScriptParser::DataType &p_datatype, GDScript *p_owner = nullptr) const;
 
 	GDScriptCodeGenerator::Address _parse_assign_right_expression(CodeGen &codegen, Error &r_error, const GDScriptParser::AssignmentNode *p_assignmentint, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
 	GDScriptCodeGenerator::Address _parse_expression(CodeGen &codegen, Error &r_error, const GDScriptParser::ExpressionNode *p_expression, bool p_root = false, bool p_initializer = false, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());