diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-22 09:15:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 09:15:45 +0200 |
| commit | be606898122d8e6cd259bfde8132dbce62d0b2ff (patch) | |
| tree | c9ea3d8a8d81d5c9595248f19b8fa9087930fbd6 /modules | |
| parent | 9906aeb2f8b492e6662e68aafe11e62524a87cc8 (diff) | |
| parent | 22358babda1452ee6db4d662dff373472b93fdc6 (diff) | |
Merge pull request #11461 from hpvb/add-likely-macros
Implement Linux-style likely()/unlikely() macros
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gd_function.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index df7b16c96e..70340f0823 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -42,7 +42,7 @@ Variant *GDFunction::_get_variant(int p_address, GDInstance *p_instance, GDScrip case ADDR_TYPE_SELF: { - if (!p_instance) { + if (unlikely(!p_instance)) { r_error = "Cannot access self without instance."; return NULL; } @@ -54,7 +54,7 @@ Variant *GDFunction::_get_variant(int p_address, GDInstance *p_instance, GDScrip } break; case ADDR_TYPE_MEMBER: { //member indexing is O(1) - if (!p_instance) { + if (unlikely(!p_instance)) { r_error = "Cannot access member without instance."; return NULL; } @@ -279,7 +279,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a #define GET_VARIANT_PTR(m_v, m_code_ofs) \ Variant *m_v; \ m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, _class, self, stack, err_text); \ - if (!m_v) \ + if (unlikely(!m_v)) \ break; #else |