merge revision(s) 3e02cd518fbe4d91c2aca7fbc3c5aafa387d3cb7: [Backport #17149]

	Trace :return of builtin methods

	using opt_invokebuiltin_delegate_leave insn.

	Since Ruby 2.7, :return of methods using builtin have not been traced properly.

1 files changed, 5 insertions, 1 deletions

diff --git a/iseq.c b/iseq.c
index cbf62176bd..9f0f5d04a1 100644
--- a/iseq.c
+++ b/iseq.c
@@ -3094,8 +3094,12 @@ rb_vm_encoded_insn_data_table_init(void)
     encoded_insn_data = st_init_numtable_with_size(VM_INSTRUCTION_SIZE / 2);
 
     for (insn = 0; insn < VM_INSTRUCTION_SIZE/2; insn++) {
+        int traced_insn = insn;
+        if (traced_insn == BIN(opt_invokebuiltin_delegate_leave)) {
+            traced_insn = BIN(opt_invokebuiltin_delegate); // to dispatch :return from leave
+        }
         st_data_t key1 = (st_data_t)INSN_CODE(insn);
-        st_data_t key2 = (st_data_t)INSN_CODE(insn + VM_INSTRUCTION_SIZE/2);
+        st_data_t key2 = (st_data_t)INSN_CODE(traced_insn + VM_INSTRUCTION_SIZE/2);
 
         insn_data[insn].insn = (int)insn;
         insn_data[insn].insn_len = insn_len(insn);