Use LIKELY and UNLIKELY macros to wrap error generation.

src/common/platform.h

@@ -101,4 +101,15 @@
 // We will undef the macro so that the function name does not get replaced
 #undef MemoryBarrier
 
+// Macro for hinting that an expression is likely to be true/false.
+#if !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
+#if defined(__GNUC__) || defined(__clang__)
+#define ANGLE_LIKELY(x) __builtin_expect(!!(x), 1)
+#define ANGLE_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+#define ANGLE_LIKELY(x) (x)
+#define ANGLE_UNLIKELY(x) (x)
+#endif  // defined(__GNUC__) || defined(__clang__)
+#endif  // !defined(ANGLE_LIKELY) || !defined(ANGLE_UNLIKELY)
+
 #endif // COMMON_PLATFORM_H_

src/libANGLE/Context.cpp

@@ -2453,7 +2453,7 @@ void Context::getProgramInterfaceivRobust(GLuint program,
 
 void Context::handleError(const Error &error) const
 {
-    if (error.isError())
+    if (ANGLE_UNLIKELY(error.isError()))
     {
         GLenum code = error.getCode();
         mErrors.insert(code);

src/libANGLE/Error.h

@@ -226,7 +226,7 @@ inline Error NoError()
 #define ANGLE_TRY_TEMPLATE(EXPR, FUNC)                 \
     {                                                  \
         auto ANGLE_LOCAL_VAR = EXPR;                   \
-        if (ANGLE_LOCAL_VAR.isError()) \
+        if (ANGLE_UNLIKELY(ANGLE_LOCAL_VAR.isError())) \
         {                                              \
             FUNC(ANGLE_LOCAL_VAR);                     \
         }                                              \
@@ -239,7 +239,7 @@ inline Error NoError()
 #define ANGLE_TRY_RESULT(EXPR, RESULT)                 \
     {                                                  \
         auto ANGLE_LOCAL_VAR = EXPR;                   \
-        if (ANGLE_LOCAL_VAR.isError())         \
+        if (ANGLE_UNLIKELY(ANGLE_LOCAL_VAR.isError())) \
         {                                              \
             return ANGLE_LOCAL_VAR.getError();         \
         }                                              \
@@ -251,7 +251,7 @@ inline Error NoError()
 #define ANGLE_SWALLOW_ERR(EXPR)                                       \
     {                                                                 \
         auto ANGLE_LOCAL_VAR = EXPR;                                  \
-        if (ANGLE_LOCAL_VAR.isError())                                \
+        if (ANGLE_UNLIKELY(ANGLE_LOCAL_VAR.isError()))                \
         {                                                             \
             ERR() << "Unhandled internal error: " << ANGLE_LOCAL_VAR; \
         }                                                             \

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -667,7 +667,7 @@ VkImageViewType GetImageViewType(gl::TextureType textureType);
 #define ANGLE_VK_TRY(command)                                          \
     {                                                                  \
         auto ANGLE_LOCAL_VAR = command;                                \
-        if (ANGLE_LOCAL_VAR != VK_SUCCESS)                             \
+        if (ANGLE_UNLIKELY(ANGLE_LOCAL_VAR != VK_SUCCESS))             \
         {                                                              \
             return rx::vk::Error(ANGLE_LOCAL_VAR, __FILE__, __LINE__); \
         }                                                              \