summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-08-02 02:40:29 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-08-02 02:40:29 +0000
commit5ba4d948ffebd7f316acd58b76d66697ea464369 (patch)
tree0f63b32cff332e4d2b2aad8b4d554f7635db85c3 /eval.c
parent71d16ad5aa18623456f54f60be29994ede7e6514 (diff)
eval.c: suppress warnings
* eval.c (exc_setup_message): setup exception message as an exception instance, and a cause from a previous exception. split from setup_exception to suppress a warning when RUBY_USE_SETJMPEX is enabled. * eval.c (setup_exception): make state volatile to suppress a warning too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/eval.c b/eval.c
index bebed0b..6b31bab 100644
--- a/eval.c
+++ b/eval.c
@@ -472,12 +472,9 @@ exc_setup_cause(VALUE exc, VALUE cause)
return exc;
}
-static void
-setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
+static inline VALUE
+exc_setup_message(rb_thread_t *th, VALUE mesg, VALUE *cause)
{
- VALUE e;
- const char *file = 0;
- int line;
int nocause = 0;
if (NIL_P(mesg)) {
@@ -489,18 +486,27 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
nocause = 0;
}
- if (cause == Qundef) {
+ if (*cause == Qundef) {
if (nocause) {
- cause = Qnil;
+ *cause = Qnil;
}
else if (!rb_ivar_defined(mesg, id_cause)) {
- cause = get_thread_errinfo(th);
+ *cause = get_thread_errinfo(th);
}
}
+ return mesg;
+}
+
+static void
+setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
+{
+ VALUE e;
+ const char *file = 0;
+ int line;
file = rb_source_loc(&line);
if ((file && !NIL_P(mesg)) || (cause != Qundef)) {
- int state = 0;
+ volatile int state = 0;
TH_PUSH_TAG(th);
if (EXEC_TAG() == TAG_NONE && !(state = rb_threadptr_set_raised(th))) {
@@ -590,6 +596,7 @@ rb_threadptr_setup_exception(rb_thread_t *th, VALUE mesg, VALUE cause)
static void
rb_longjmp(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
{
+ mesg = exc_setup_message(th, mesg, &cause);
setup_exception(th, tag, mesg, cause);
rb_thread_raised_clear(th);
TH_JUMP_TAG(th, tag);