From 47a5b34aba514fd075664b4cf0e95e0f7f26609f Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@users.noreply.github.com>
Date: Thu, 8 Dec 2022 15:02:21 -0500
Subject: [PATCH] YJIT: Fold check-yjit-bindings into yjit-bindgen

So it's shorter on CI and the hint about how the fix the failure shows
up. It's going to print a diff locally too, but that should be fine.
---
 .github/workflows/yjit-ubuntu.yml | 2 +-
 yjit/yjit.mk                      | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index 3ad2982f8c..011420c157 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -47,7 +47,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - test_task: "check-yjit-bindings"
+          - test_task: "yjit-bindgen"
             hint: "To fix: use patch in logs"
             configure: "--with-gcc=clang-12 --enable-yjit=dev"
 
diff --git a/yjit/yjit.mk b/yjit/yjit.mk
index fc0061eb29..cc7b42d26a 100644
--- a/yjit/yjit.mk
+++ b/yjit/yjit.mk
@@ -62,11 +62,8 @@ ifneq ($(strip $(CARGO)),) # if configure found Cargo
 .PHONY: yjit-bindgen yjit-bindgen-show-unused
 yjit-bindgen: yjit.$(OBJEXT)
 	YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS)
+	if [ 'x$(HAVE_GIT)' = xyes ]; then $(GIT) -C "$(top_srcdir)" diff --exit-code yjit/src/cruby_bindings.inc.rs; fi
 
 check-yjit-bindgen-unused: yjit.$(OBJEXT)
 	RUST_LOG=warn YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) 2>&1 | (! grep "unused option: --allow")
-
-# For CI, check whether YJIT's FFI bindings are up-to-date.
-check-yjit-bindings: check-yjit-bindgen-unused
-	git -C "$(top_srcdir)" diff --exit-code yjit/src/cruby_bindings.inc.rs
 endif