1 files changed, 34 insertions, 7 deletions

diff --git a/modules/gdscript/gdscript_byte_codegen.cpp b/modules/gdscript/gdscript_byte_codegen.cpp
index d84457713d..a4238e2eab 100644
--- a/modules/gdscript/gdscript_byte_codegen.cpp
+++ b/modules/gdscript/gdscript_byte_codegen.cpp
@@ -40,10 +40,6 @@ uint32_t GDScriptByteCodeGenerator::add_parameter(const StringName &p_name, bool
 	function->_argument_count++;
 	function->argument_types.push_back(p_type);
 	if (p_is_optional) {
-		if (function->_default_arg_count == 0) {
-			append(GDScriptFunction::OPCODE_JUMP_TO_DEF_ARGUMENT);
-		}
-		function->default_arguments.push_back(opcodes.size());
 		function->_default_arg_count++;
 	}
 
@@ -96,7 +92,12 @@ void GDScriptByteCodeGenerator::pop_temporary() {
 	current_temporaries--;
 }
 
-void GDScriptByteCodeGenerator::start_parameters() {}
+void GDScriptByteCodeGenerator::start_parameters() {
+	if (function->_default_arg_count > 0) {
+		append(GDScriptFunction::OPCODE_JUMP_TO_DEF_ARGUMENT);
+		function->default_arguments.push_back(opcodes.size());
+	}
+}
 
 void GDScriptByteCodeGenerator::end_parameters() {
 	function->default_arguments.invert();
@@ -167,7 +168,7 @@ GDScriptFunction *GDScriptByteCodeGenerator::write_end() {
 	}
 
 	if (function->default_arguments.size()) {
-		function->_default_arg_count = function->default_arguments.size();
+		function->_default_arg_count = function->default_arguments.size() - 1;
 		function->_default_arg_ptr = &function->default_arguments[0];
 	} else {
 		function->_default_arg_count = 0;
@@ -345,7 +346,28 @@ void GDScriptByteCodeGenerator::set_initial_line(int p_line) {
 #define IS_BUILTIN_TYPE(m_var, m_type) \
 	(m_var.type.has_type && m_var.type.kind == GDScriptDataType::BUILTIN && m_var.type.builtin_type == m_type)
 
-void GDScriptByteCodeGenerator::write_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) {
+void GDScriptByteCodeGenerator::write_unary_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand) {
+	if (HAS_BUILTIN_TYPE(p_left_operand)) {
+		// Gather specific operator.
+		Variant::ValidatedOperatorEvaluator op_func = Variant::get_validated_operator_evaluator(p_operator, p_left_operand.type.builtin_type, Variant::NIL);
+
+		append(GDScriptFunction::OPCODE_OPERATOR_VALIDATED, 3);
+		append(p_left_operand);
+		append(Address());
+		append(p_target);
+		append(op_func);
+		return;
+	}
+
+	// No specific types, perform variant evaluation.
+	append(GDScriptFunction::OPCODE_OPERATOR, 3);
+	append(p_left_operand);
+	append(Address());
+	append(p_target);
+	append(p_operator);
+}
+
+void GDScriptByteCodeGenerator::write_binary_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) {
 	if (HAS_BUILTIN_TYPE(p_left_operand) && HAS_BUILTIN_TYPE(p_right_operand)) {
 		// Gather specific operator.
 		Variant::ValidatedOperatorEvaluator op_func = Variant::get_validated_operator_evaluator(p_operator, p_left_operand.type.builtin_type, p_right_operand.type.builtin_type);
@@ -636,6 +658,11 @@ void GDScriptByteCodeGenerator::write_assign_false(const Address &p_target) {
 	append(p_target);
 }
 
+void GDScriptByteCodeGenerator::write_assign_default_parameter(const Address &p_dst, const Address &p_src) {
+	write_assign(p_dst, p_src);
+	function->default_arguments.push_back(opcodes.size());
+}
+
 void GDScriptByteCodeGenerator::write_cast(const Address &p_target, const Address &p_source, const GDScriptDataType &p_type) {
 	int index = 0;