godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GDScript: Properly check type info in release builds

Browse Source 
This makes sure native methods and properties have the actual type
checked to compare for compatibility and inference.
This commit is contained in:
George Marques 2022-04-01 10:28:26 -03:00
parent 226103d166
commit 663978e8ba
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gdscript/gdscript_parser.cpp
View File

@ -6983,8 +6983,6 @@ bool GDScriptParser::_get_function_signature(DataType &p_base_type, const String
return false; return false;
} }
#ifdef DEBUG_METHODS_ENABLED
// Only native remains // Only native remains
if (!ClassDB::class_exists(native)) { if (!ClassDB::class_exists(native)) {
native = "_" + native.operator String(); native = "_" + native.operator String();
@ -7058,9 +7056,6 @@ bool GDScriptParser::_get_function_signature(DataType &p_base_type, const String
r_arg_types.push_back(_type_from_property(method->get_argument_info(i))); r_arg_types.push_back(_type_from_property(method->get_argument_info(i)));
} }
return true; return true;
#else
return false;
#endif
} }
GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const OperatorNode *p_call) { GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const OperatorNode *p_call) {
@ -7561,16 +7556,12 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
StringName getter_name = ClassDB::get_property_getter(native, p_member); StringName getter_name = ClassDB::get_property_getter(native, p_member);
if (getter_name != StringName()) { if (getter_name != StringName()) {
// Use the getter return type // Use the getter return type
#ifdef DEBUG_METHODS_ENABLED
MethodBind *getter_method = ClassDB::get_method(native, getter_name); MethodBind *getter_method = ClassDB::get_method(native, getter_name);
if (getter_method) { if (getter_method) {
r_member_type = _type_from_property(getter_method->get_return_info()); r_member_type = _type_from_property(getter_method->get_return_info());
} else { } else {
r_member_type = DataType(); r_member_type = DataType();
} }
#else
r_member_type = DataType();
#endif
} else { } else {
r_member_type = _type_from_property(E->get()); r_member_type = _type_from_property(E->get());
} }
@ -7601,16 +7592,12 @@ bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringN
StringName getter_name = ClassDB::get_property_getter(native, p_member); StringName getter_name = ClassDB::get_property_getter(native, p_member);
if (getter_name != StringName()) { if (getter_name != StringName()) {
// Use the getter return type // Use the getter return type
#ifdef DEBUG_METHODS_ENABLED
MethodBind *getter_method = ClassDB::get_method(native, getter_name); MethodBind *getter_method = ClassDB::get_method(native, getter_name);
if (getter_method) { if (getter_method) {
r_member_type = _type_from_property(getter_method->get_return_info()); r_member_type = _type_from_property(getter_method->get_return_info());
} else { } else {
r_member_type = DataType(); r_member_type = DataType();
} }
#else
r_member_type = DataType();
#endif
} else { } else {
r_member_type = _type_from_property(E->get()); r_member_type = _type_from_property(E->get());
} }