From 258ac07907b2e3561db48d53ed0a50c8dd05f102 Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@users.noreply.github.com>
Date: Mon, 12 Dec 2022 15:59:29 -0500
Subject: [PATCH] YJIT: Generate debug info in release builds (#6910)

* YJIT: Generate debug info in release builds

They are helpful in case we need to do core dump debugging.

* Remove Cirrus DOC skip rule

The syntax for this is weird, and escaping [ and ] cause parse failures.
Cirrus' docs said to surround with .*, but then that seems to skip
everything. Revert e0a4205eb785f266fdf08f409c2f112f5dfcb229 for now.
---
 .cirrus.yml     | 4 ++--
 common.mk       | 1 +
 yjit/Cargo.toml | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5d1f5dbbbb..6c47159921 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -10,7 +10,7 @@ env:
 
 task:
   name: Arm64 Graviton2 / $CC
-  skip: "changesIncludeOnly('doc/**', '**.{md,rdoc,ronn,[1-8]}', '.document') || $CIRRUS_CHANGE_TITLE =~ '.*[DOC].*'"
+  skip: "changesIncludeOnly('doc/**', '**.{md,rdoc,ronn,[1-8]}', '.document')"
   arm_container:
     # We use the arm64 images at https://github.com/ruby/ruby-ci-image/pkgs/container/ruby-ci-image .
     image: ghcr.io/ruby/ruby-ci-image:$CC
@@ -66,7 +66,7 @@ task:
 yjit_task:
   name: Arm64 Graviton2 / $CC YJIT
   auto_cancellation: $CIRRUS_BRANCH != 'master'
-  skip: "changesIncludeOnly('doc/**', '**.{md,rdoc,ronn,[1-8]}', '.document') || $CIRRUS_CHANGE_TITLE =~ '.*[DOC].*'"
+  skip: "changesIncludeOnly('doc/**', '**.{md,rdoc,ronn,[1-8]}', '.document')"
   arm_container:
     # We use the arm64 images at https://github.com/ruby/ruby-ci-image/pkgs/container/ruby-ci-image .
     image: ghcr.io/ruby/ruby-ci-image:$CC
diff --git a/common.mk b/common.mk
index a9b155e0fd..c950b781d2 100644
--- a/common.mk
+++ b/common.mk
@@ -224,6 +224,7 @@ MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
 YJIT_RUSTC_ARGS = --crate-name=yjit \
 	--crate-type=staticlib \
 	--edition=2021 \
+	-g \
 	-C opt-level=3 \
 	-C overflow-checks=on \
 	'--out-dir=$(CARGO_TARGET_DIR)/release/' \
diff --git a/yjit/Cargo.toml b/yjit/Cargo.toml
index 6b6f12be46..18b1d10bd8 100644
--- a/yjit/Cargo.toml
+++ b/yjit/Cargo.toml
@@ -43,3 +43,5 @@ opt-level = 3
 # The extra robustness that comes from checking for arithmetic overflow is
 # worth the performance cost for the compiler.
 overflow-checks = true
+# Generate debug info
+debug = true