From 3dd4e381fe3c7faf886145ad7ab2152c6b199d69 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Sun, 13 Nov 2022 20:35:35 -0800
Subject: Reduce the number of branches in jit_exec (#6722)

* Reduce the number of branches in jit_exec

* Address build failure in some configurations

* Refactor yjit.h
---
 yjit.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yjit.h')

diff --git a/yjit.h b/yjit.h
index 7884aef18d..5f2722639f 100644
--- a/yjit.h
+++ b/yjit.h
@@ -15,7 +15,7 @@
 # define YJIT_STATS RUBY_DEBUG
 #endif
 
-#if USE_YJIT
+#if USE_YJIT && !defined(MJIT_HEADER) // MJIT and YJIT can't be enabled simultaneously
 
 // We generate x86 or arm64 assembly
 #if defined(_WIN32) ? defined(_M_AMD64) : (defined(__x86_64__) || defined(__aarch64__))
-- 
cgit v1.2.3