1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Fix assert_no_exits (#8579)

Browse Source
This commit is contained in:
Takashi Kokubun 2023-10-02 14:09:51 -07:00 committed by GitHub
parent e6d730023d
commit 492e9437dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/ruby/test_yjit.rb
View File

@ -1153,7 +1153,7 @@ class TestYJIT < Test::Unit::TestCase
end end
def test_invalidate_cyclic_branch def test_invalidate_cyclic_branch
assert_compiles(<<~'RUBY', result: 2) assert_compiles(<<~'RUBY', result: 2, exits: { opt_plus: 1 })
def foo def foo
i = 0 i = 0
while i < 2 while i < 2
@ -1171,7 +1171,7 @@ class TestYJIT < Test::Unit::TestCase
end end
def test_tracing_str_uplus def test_tracing_str_uplus
assert_compiles(<<~RUBY, frozen_string_literal: true, result: :ok) assert_compiles(<<~RUBY, frozen_string_literal: true, result: :ok, exits: { putspecialobject: 1, definemethod: 1 })
def str_uplus def str_uplus
_ = 1 _ = 1
_ = 2 _ = 2
@ -1216,7 +1216,7 @@ class TestYJIT < Test::Unit::TestCase
def test_return_to_invalidated_block def test_return_to_invalidated_block
# [Bug #19463] # [Bug #19463]
assert_compiles(<<~RUBY, result: [1, 1, :ugokanai]) assert_compiles(<<~RUBY, result: [1, 1, :ugokanai], exits: { definesmethod: 1, getlocal_WC_0: 1 })
klass = Class.new do klass = Class.new do
def self.lookup(hash, key) = hash[key] def self.lookup(hash, key) = hash[key]
@ -1257,7 +1257,7 @@ class TestYJIT < Test::Unit::TestCase
def test_setivar_on_class def test_setivar_on_class
# Bug in https://github.com/ruby/ruby/pull/8152 # Bug in https://github.com/ruby/ruby/pull/8152
assert_compiles(<<~RUBY, result: :ok) assert_compiles(<<~RUBY, result: :ok, exits: { opt_getconstant_path: 2 })
class Base class Base
def self.or_equal def self.or_equal
@or_equal ||= Object.new @or_equal ||= Object.new
@ -1280,7 +1280,7 @@ class TestYJIT < Test::Unit::TestCase
def test_nested_send def test_nested_send
#[Bug #19464] #[Bug #19464]
assert_compiles(<<~RUBY, result: [:ok, :ok]) assert_compiles(<<~RUBY, result: [:ok, :ok], exits: { opt_getconstant_path: 1, defineclass: 1 })
klass = Class.new do klass = Class.new do
class << self class << self
alias_method :my_send, :send alias_method :my_send, :send
@ -1318,7 +1318,7 @@ class TestYJIT < Test::Unit::TestCase
end end
def test_io_reopen_clobbering_singleton_class def test_io_reopen_clobbering_singleton_class
assert_compiles(<<~RUBY, result: [:ok, :ok]) assert_compiles(<<~RUBY, result: [:ok, :ok], exits: { definesmethod: 1, opt_eq: 2 })
def $stderr.to_i = :i def $stderr.to_i = :i
def test = $stderr.to_i def test = $stderr.to_i
@ -1434,7 +1434,7 @@ class TestYJIT < Test::Unit::TestCase
# barriers, cache misses.) # barriers, cache misses.)
if exits != :any && if exits != :any &&
exits != recorded_exits && exits != recorded_exits &&
!exits.all? { |k, v| v === recorded_exits[k] } # triple-equal checks range membership or integer equality (exits.keys != recorded_exits.keys || !exits.all? { |k, v| v === recorded_exits[k] }) # triple-equal checks range membership or integer equality
flunk "Expected #{exits.empty? ? "no" : exits.inspect} exits" \ flunk "Expected #{exits.empty? ? "no" : exits.inspect} exits" \
", but got\n#{recorded_exits.inspect}" ", but got\n#{recorded_exits.inspect}"
end end