From 79787c183f3552198c181a1fb33e7378eb6211b8 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 9 Jul 2017 19:47:28 +0000 Subject: merge revision(s) 58262,5826: [Backport #13369] fix TracePoint#return_value with non-local exits * vm.c: get return_value from imemo_throw_data object (THROW_DATA_VAL()). imemo_throw_data (TAG_BREAK) contains returned value. However, imemo_throw_data (TAG_BREAK) can skip several frames so that we need to use it only once (at most internal frame). To record it, we introduced THROW_DATA_CONSUMED and check it. * internal.h: define THROW_DATA_CONSUMED flag. * test/ruby/test_settracefunc.rb: add tests for [Bug #13369] * vm_insnhelper.h: add THROW_DATA_CONSUMED_P() and THROW_DATA_CONSUMED_SET(). unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- internal.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'internal.h') diff --git a/internal.h b/internal.h index 102ae02f2f..d05d5366dd 100644 --- a/internal.h +++ b/internal.h @@ -776,6 +776,8 @@ struct vm_svar { /* THROW_DATA */ +#define THROW_DATA_CONSUMED IMEMO_FL_USER0 + struct vm_throw_data { VALUE flags; VALUE reserved; @@ -784,7 +786,7 @@ struct vm_throw_data { VALUE throw_state; }; -#define THROW_DATA_P(err) RB_TYPE_P((err), T_IMEMO) +#define THROW_DATA_P(err) RB_TYPE_P(((VALUE)err), T_IMEMO) /* IFUNC */ -- cgit v1.2.3