summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Wu <XrXr@users.noreply.github.com>2019-08-07 22:15:45 -0400
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-08-09 01:29:53 +0900
commit050b932152fb3004c78af223186afe1aa397f06f (patch)
treec5a0e56a30066fefc220dbd6268e9a8b405efae9
parent830fd0418170843f234ed82e07d2fd61d86153e7 (diff)
Iseq#to_binary: Add support for NoMatchingPatternError and TypeError
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
-rw-r--r--compile.c12
-rw-r--r--test/ruby/test_iseq.rb10
2 files changed, 22 insertions, 0 deletions
diff --git a/compile.c b/compile.c
index cb9d807..d4594e8 100644
--- a/compile.c
+++ b/compile.c
@@ -9853,6 +9853,8 @@ enum ibf_object_class_index {
IBF_OBJECT_CLASS_OBJECT,
IBF_OBJECT_CLASS_ARRAY,
IBF_OBJECT_CLASS_STANDARD_ERROR,
+ IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR,
+ IBF_OBJECT_CLASS_TYPE_ERROR,
};
struct ibf_object_string {
@@ -9947,6 +9949,12 @@ ibf_dump_object_class(struct ibf_dump *dump, VALUE obj)
else if (obj == rb_eStandardError) {
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 {
rb_obj_info_dump(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;
case IBF_OBJECT_CLASS_STANDARD_ERROR:
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);
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index b4d44e5..1a1abc6 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -433,6 +433,16 @@ class TestISeq < Test::Unit::TestCase
assert_iseq_to_binary("@x ||= (1..2)")
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
assert_iseq_to_binary("#{<<~"begin;"}\n#{<<~'end;'}", '[Bug #14660]').eval
begin;