diff --git a/AK/Atomic.h b/AK/Atomic.h index ec7191250a..e1a1007b2e 100644 --- a/AK/Atomic.h +++ b/AK/Atomic.h @@ -51,8 +51,7 @@ template { if (order == memory_order_acq_rel || order == memory_order_release) return __atomic_compare_exchange_n(var, &expected, desired, false, memory_order_release, memory_order_acquire); - else - return __atomic_compare_exchange_n(var, &expected, desired, false, order, order); + return __atomic_compare_exchange_n(var, &expected, desired, false, order, order); } template> @@ -60,8 +59,7 @@ template> { if (order == memory_order_acq_rel || order == memory_order_release) return __atomic_compare_exchange_n(var, &expected, desired, false, memory_order_release, memory_order_acquire); - else - return __atomic_compare_exchange_n(var, &expected, desired, false, order, order); + return __atomic_compare_exchange_n(var, &expected, desired, false, order, order); } template> @@ -69,8 +67,7 @@ template> { if (order == memory_order_acq_rel || order == memory_order_release) return __atomic_compare_exchange_n(const_cast(var), &expected, nullptr, false, memory_order_release, memory_order_acquire); - else - return __atomic_compare_exchange_n(const_cast(var), &expected, nullptr, false, order, order); + return __atomic_compare_exchange_n(const_cast(var), &expected, nullptr, false, order, order); } template @@ -174,8 +171,7 @@ public: { if (order == memory_order_acq_rel || order == memory_order_release) return __atomic_compare_exchange(&m_value, &expected, &desired, false, memory_order_release, memory_order_acquire); - else - return __atomic_compare_exchange(&m_value, &expected, &desired, false, order, order); + return __atomic_compare_exchange(&m_value, &expected, &desired, false, order, order); } ALWAYS_INLINE operator T() const volatile noexcept @@ -238,8 +234,7 @@ public: { if (order == memory_order_acq_rel || order == memory_order_release) return __atomic_compare_exchange_n(&m_value, &expected, desired, false, memory_order_release, memory_order_acquire); - else - return __atomic_compare_exchange_n(&m_value, &expected, desired, false, order, order); + return __atomic_compare_exchange_n(&m_value, &expected, desired, false, order, order); } ALWAYS_INLINE T operator++() volatile noexcept @@ -369,8 +364,7 @@ public: { if (order == memory_order_acq_rel || order == memory_order_release) return __atomic_compare_exchange_n(&m_value, &expected, desired, false, memory_order_release, memory_order_acquire); - else - return __atomic_compare_exchange_n(&m_value, &expected, desired, false, order, order); + return __atomic_compare_exchange_n(&m_value, &expected, desired, false, order, order); } T* operator++() volatile noexcept diff --git a/AK/RedBlackTree.h b/AK/RedBlackTree.h index d81a14993a..1734f83997 100644 --- a/AK/RedBlackTree.h +++ b/AK/RedBlackTree.h @@ -118,9 +118,9 @@ protected: { Node* candidate = nullptr; while (node) { - if (key == node->key) { + if (key == node->key) return node; - } else if (key < node->key) { + if (key < node->key) { node = node->left_child; } else { candidate = node; @@ -137,11 +137,10 @@ protected: Node* temp = m_root; while (temp) { parent = temp; - if (node->key < temp->key) { + if (node->key < temp->key) temp = temp->left_child; - } else { + else temp = temp->right_child; - } } if (!parent) { // new root node->color = Color::Black; @@ -149,11 +148,11 @@ protected: m_size = 1; m_minimum = node; return; - } else if (node->key < parent->key) { // we are the left child - parent->left_child = node; - } else { // we are the right child - parent->right_child = node; } + if (node->key < parent->key) // we are the left child + parent->left_child = node; + else // we are the right child + parent->right_child = node; node->parent = parent; if (node->parent->parent) // no fixups to be done for a height <= 2 tree @@ -351,14 +350,13 @@ protected: while (node->left_child) node = node->left_child; return node; - } else { - auto temp = node->parent; - while (temp && node == temp->right_child) { - node = temp; - temp = temp->parent; - } - return temp; } + auto temp = node->parent; + while (temp && node == temp->right_child) { + node = temp; + temp = temp->parent; + } + return temp; } static Node* predecessor(Node* node) @@ -369,14 +367,13 @@ protected: while (node->right_child) node = node->right_child; return node; - } else { - auto temp = node->parent; - while (temp && node == temp->left_child) { - node = temp; - temp = temp->parent; - } - return temp; } + auto temp = node->parent; + while (temp && node == temp->left_child) { + node = temp; + temp = temp->parent; + } + return temp; } Node* m_root { nullptr }; diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h index 9413e77346..e71d7497ef 100644 --- a/AK/StdLibExtras.h +++ b/AK/StdLibExtras.h @@ -141,9 +141,8 @@ constexpr bool is_constant_evaluated() constexpr type abs(type num) \ { \ if (is_constant_evaluated()) \ - return num < zero ? -num : num; \ - else \ - return __builtin_##intrinsic(num); \ + return num < (zero) ? -num : num; \ + return __builtin_##intrinsic(num); \ } __DEFINE_GENERIC_ABS(int, 0, abs);