kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Iseq#to_binary: Add support for NoMatchingPatternError and TypeError

Browse source 
Binary dumping the iseq for `case foo in []; end` used to crash as
there was no handling for these exception classes.

Pattern matching generates these classes as operands to `putobject`.

[Bug #16088]
Closes: https://github.com/ruby/ruby/pull/2325
This commit is contained in:
Alan Wu 2019-08-07 22:15:45 -04:00 • committed by Nobuyoshi Nakada
parent 830fd04181
commit 050b932152
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compile.c
View file

@ -9853,6 +9853,8 @@ enum ibf_object_class_index {
IBF_OBJECT_CLASS_OBJECT, IBF_OBJECT_CLASS_OBJECT,
IBF_OBJECT_CLASS_ARRAY, IBF_OBJECT_CLASS_ARRAY,
IBF_OBJECT_CLASS_STANDARD_ERROR, IBF_OBJECT_CLASS_STANDARD_ERROR,
IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR,
IBF_OBJECT_CLASS_TYPE_ERROR,
}; };
struct ibf_object_string { struct ibf_object_string {
@ -9947,6 +9949,12 @@ ibf_dump_object_class(struct ibf_dump *dump, VALUE obj)
else if (obj == rb_eStandardError) { else if (obj == rb_eStandardError) {
cindex = IBF_OBJECT_CLASS_STANDARD_ERROR; cindex = IBF_OBJECT_CLASS_STANDARD_ERROR;
} }
else if (obj == rb_eNoMatchingPatternError) {
cindex = IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR;
}
else if (obj == rb_eTypeError) {
cindex = IBF_OBJECT_CLASS_TYPE_ERROR;
}
else { else {
rb_obj_info_dump(obj); rb_obj_info_dump(obj);
rb_p(obj); rb_p(obj);
@ -9968,6 +9976,10 @@ ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_heade
return rb_cArray; return rb_cArray;
case IBF_OBJECT_CLASS_STANDARD_ERROR: case IBF_OBJECT_CLASS_STANDARD_ERROR:
return rb_eStandardError; return rb_eStandardError;
case IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR:
return rb_eNoMatchingPatternError;
case IBF_OBJECT_CLASS_TYPE_ERROR:
return rb_eTypeError;
} }
rb_raise(rb_eArgError, "ibf_load_object_class: unknown class (%d)", (int)cindex); rb_raise(rb_eArgError, "ibf_load_object_class: unknown class (%d)", (int)cindex);

10
test/ruby/test_iseq.rb
View file

@ -433,6 +433,16 @@ class TestISeq < Test::Unit::TestCase
assert_iseq_to_binary("@x ||= (1..2)") assert_iseq_to_binary("@x ||= (1..2)")
end end
def test_to_binary_pattern_matching
code = "case foo in []; end"
iseq = compile(code)
assert_include(iseq.disasm, "TypeError")
assert_include(iseq.disasm, "NoMatchingPatternError")
EnvUtil.suppress_warning do
assert_iseq_to_binary(code, "[Feature #14912]")
end
end
def test_to_binary_line_info def test_to_binary_line_info
assert_iseq_to_binary("#{<<~"begin;"}\n#{<<~'end;'}", '[Bug #14660]').eval assert_iseq_to_binary("#{<<~"begin;"}\n#{<<~'end;'}", '[Bug #14660]').eval
begin; begin;