commit 32746ae275593e2532a99c19b2c2e8858a042e3a
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 09 19:57:58 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 09 23:03:03 2023 +0000
tree 6e9c3e8326e3404c45376e1f4d6172134b2c249b
parent 97649ae47084a1c76e0bdc8c35956741dfc3a985

Use C++20 [[unlikely]] instead of UNLIKELY macro

Bug: 302723053
Test: mma
Change-Id: I126772474763a55f43de0cd4a3d2605f7f84da3b

libs/binder/Binder.cpp

diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp
index 0f4a6ca..aa67869 100644
--- a/libs/binder/Binder.cpp
+++ b/libs/binder/Binder.cpp
@@ -29,7 +29,6 @@
 #include <binder/Parcel.h>
 #include <binder/RecordedTransaction.h>
 #include <binder/RpcServer.h>
-#include <cutils/compiler.h>
 #include <private/android_filesystem_config.h>
 #include <pthread.h>
 #include <utils/misc.h>
@@ -402,7 +401,7 @@
         }
     }
 
-    if (CC_UNLIKELY(kEnableKernelIpc && mRecordingOn && code != START_RECORDING_TRANSACTION)) {
+    if (kEnableKernelIpc && mRecordingOn && code != START_RECORDING_TRANSACTION) [[unlikely]] {
         Extras* e = mExtras.load(std::memory_order_acquire);
         AutoMutex lock(e->mLock);
         if (mRecordingOn) {