* compile.c, insns.def (checkmatch):

  remove checkincludearray instruction and
  add new instruction checkmatch.
  This change is to solve
  [Bug #4438] "rescue args type check omitted".
* iseq.c: increment ISEQ_MAJOR_VERSION because removal of
  checkincludearray instruction.
* vm_core.h: add several definitions for
  the checkmatch instruction.
* vm_insnhelper.c (check_match): added.
* bootstraptest/test_exception.rb: add a test.
* test/ruby/test_exception.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 0 deletions

diff --git a/vm_core.h b/vm_core.h
index 62850f28ce..da20e18acc 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -598,6 +598,16 @@ typedef struct {
 } rb_binding_t;
 
 /* used by compile time and send insn */
+
+enum vm_check_match_type {
+    VM_CHECKMATCH_TYPE_WHEN = 1,
+    VM_CHECKMATCH_TYPE_CASE = 2,
+    VM_CHECKMATCH_TYPE_RESCUE = 3
+};
+
+#define VM_CHECKMATCH_TYPE_MASK   0x03
+#define VM_CHECKMATCH_ARRAY       0x04
+
 #define VM_CALL_ARGS_SPLAT_BIT     (0x01 << 1)
 #define VM_CALL_ARGS_BLOCKARG_BIT  (0x01 << 2)
 #define VM_CALL_FCALL_BIT          (0x01 << 3)