asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #53015 from timothyqiu/cast-crash

Browse source
This commit is contained in:
Rémi Verschelde 2021-09-26 12:05:38 +02:00 committed by GitHub
commit 8fb06b45d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/variant.cpp
View file

@ -804,22 +804,15 @@ bool Variant::is_one() const {
}
ObjectID Variant::get_object_instance_id() const {
if (type != OBJECT) {
if (unlikely(type != OBJECT)) {
return 0;
}
#ifdef DEBUG_ENABLED
if (is_ref()) {
return !_get_obj().ref.is_null() ? _REF_OBJ_PTR(*this)->get_instance_id() : 0;
} else {
} else if (likely(_get_obj().rc)) {
return _get_obj().rc->instance_id;
}
#else
if (is_ref() && _get_obj().ref.is_null()) {
return 0;
} else if (likely(!_get_obj().ref.is_null())) {
return _REF_OBJ_PTR(*this)->get_instance_id();
} else {
return _get_obj().rc->get_ptr()->get_instance_id();
return 0;
}
#endif
}
bool Variant::is_invalid_object() const {