Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YJIT: Save PC on rb_str_concat #7586

Merged
merged 1 commit into from Mar 23, 2023
Merged

Conversation

k0kubun
Copy link
Member

@k0kubun k0kubun commented Mar 23, 2023

Fix Shopify#514

[Bug #19483]

make test-all TESTS="test/ruby/test_m17n_comb.rb -n /test_str_concat/" RUN_OPTS="--yjit-call-threshold=1" crashes without this, and this change fixes it. Also this PR includes a test case that trips assertion on dev build.

@matzbot matzbot requested a review from a team March 23, 2023 19:21
@k0kubun k0kubun force-pushed the yjit-fix-concat branch 2 times, most recently from 16ebb61 to c81e8b9 Compare March 23, 2023 19:27
[Bug #19483]

Co-authored-by: Alan Wu <alansi.xingwu@shopify.com>
@k0kubun k0kubun merged commit b4e438d into ruby:master Mar 23, 2023
96 checks passed
@k0kubun k0kubun deleted the yjit-fix-concat branch March 23, 2023 20:43
matzbot pushed a commit that referenced this pull request Jul 16, 2023
…Backport #19483]

	YJIT: Protect strings from GC on String#<< (#7466)

	Fix Shopify/yjit#310

	[Bug #19483]

	Co-authored-by: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@shopify.com>
	Co-authored-by: Jimmy Miller <jimmy.miller@shopify.com>
	---
	 yjit/src/codegen.rs | 3 +++
	 1 file changed, 3 insertions(+)

	YJIT: Save PC on rb_str_concat (#7586)

	[Bug #19483]

	Co-authored-by: Alan Wu <alansi.xingwu@shopify.com>
	---
	 test/ruby/test_yjit.rb | 19 +++++++++++++++++++
	 yjit/src/codegen.rs    |  6 ++++--
	 2 files changed, 23 insertions(+), 2 deletions(-)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants