1 files changed, 4 insertions, 0 deletions
diff --git a/thread.c b/thread.c
index aedd0c1e0e..14a4148c6f 100644
--- a/thread.c
+++ b/thread.c
@@ -145,7 +145,11 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
 } while(0)
 
 #ifdef __GNUC__
+#ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR
+#define only_if_constant(expr, notconst) __builtin_choose_expr(__builtin_constant_p(expr), (expr), (notconst))
+#else
 #define only_if_constant(expr, notconst) (__builtin_constant_p(expr) ? (expr) : (notconst))
+#endif
 #else
 #define only_if_constant(expr, notconst) notconst
 #endif