diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 10:43:57 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 10:43:57 +0000 |
commit | fd8fbe37fd49f690c82d48a25066abbf0313f005 (patch) | |
tree | 719c11f457237e072c6f4c55f80cf53612ea544b /internal.h | |
parent | 86024f70cff6c8029633467fd919f1b8cd9cd36c (diff) |
merge revision(s) 58262,58263: [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().
internal.h: parenthesize macro argument
* internal.h (THROW_DATA_P): parenthesize the argument which is
casted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'internal.h')
-rw-r--r-- | internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/internal.h b/internal.h index 8eadb3d5b1..19bfaa5238 100644 --- a/internal.h +++ b/internal.h @@ -583,6 +583,8 @@ struct vm_svar { /* THROW_DATA */ +#define THROW_DATA_CONSUMED IMEMO_FL_USER0 + struct vm_throw_data { VALUE flags; VALUE reserved; @@ -591,7 +593,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 */ |