import Workstation 16.2.4 module sources

Author: mkubecek

vmmon-only/include/vm_asm_x86.h

@@ -61,12 +61,15 @@
  *  ASSERT_ON_COMPILE(sizeof(Selector) == 2 &&                            \
  *                    ((__builtin_constant_p(expr) ? ((expr) >> 16) == 0) \
  *                                                 : sizeof(expr) <= 2)
+ * The __builtin_choose_expr is due to GCC bug 79482:
+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79482
  */
 #ifndef USE_UBSAN
 #define ASSERT_ON_COMPILE_SELECTOR_SIZE(expr)                                \
    ASSERT_ON_COMPILE(sizeof(Selector) == 2 &&                                \
-                     ((__builtin_constant_p(expr) && ((expr) >> 16) == 0) || \
-                      sizeof(expr) <= 2))
+                     __builtin_choose_expr(__builtin_constant_p(expr),       \
+                                           ((expr) >> 16) == 0,              \
+                                           sizeof(expr) <= 2))
 #else
 #define ASSERT_ON_COMPILE_SELECTOR_SIZE(expr)
 #endif