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

Merge pull request #94238 from RandomShaper/ref_is_now_rc 

Make errors on `RefCounted.free()` more accurate
This commit is contained in:
Rémi Verschelde 2024-07-17 11:43:32 +02:00
parent 5c2bc6ec96 76bfe8e0fd
commit ab67408390
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/object/object.cpp
View File

@ -763,7 +763,7 @@ Variant Object::callp(const StringName &p_method, const Variant **p_args, int p_
} }
if (is_ref_counted()) { if (is_ref_counted()) {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
ERR_FAIL_V_MSG(Variant(), "Can't 'free' a reference."); ERR_FAIL_V_MSG(Variant(), "Can't free a RefCounted object.");
} }
if (_lock_index.get() > 1) { if (_lock_index.get() > 1) {

4
modules/gdscript/gdscript_vm.cpp
View File

@ -1807,7 +1807,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
} else if (methodstr == "free") { } else if (methodstr == "free") {
if (err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) { if (err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) {
if (base->is_ref_counted()) { if (base->is_ref_counted()) {
err_text = "Attempted to free a reference."; err_text = "Attempted to free a RefCounted object.";
OPCODE_BREAK; OPCODE_BREAK;
} else if (base->get_type() == Variant::OBJECT) { } else if (base->get_type() == Variant::OBJECT) {
err_text = "Attempted to free a locked object (calling or emitting)."; err_text = "Attempted to free a locked object (calling or emitting).";
@ -1898,7 +1898,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
} else if (methodstr == "free") { } else if (methodstr == "free") {
if (err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) { if (err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) {
if (base->is_ref_counted()) { if (base->is_ref_counted()) {
err_text = "Attempted to free a reference."; err_text = "Attempted to free a RefCounted object.";
OPCODE_BREAK; OPCODE_BREAK;
} else if (base->get_type() == Variant::OBJECT) { } else if (base->get_type() == Variant::OBJECT) {
err_text = "Attempted to free a locked object (calling or emitting)."; err_text = "Attempted to free a locked object (calling or emitting).";