summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-24 02:05:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-24 02:05:28 +0000
commitdcc004cba9ebb784bad46bdb35f92edcb113a115 (patch)
tree6056ea7544e14e07d1c75492245e97dd8dfd1aa8 /load.c
parentedad4f3bc64aafb1c12e2a681c17a504ca5e6d31 (diff)
eval.c: use the given thread
* eval.c (setup_exception): use the given thread instead of implicit current thread. * load.c (rb_load_internal0): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r--load.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/load.c b/load.c
index 65017c9..86cf735 100644
--- a/load.c
+++ b/load.c
@@ -600,7 +600,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap)
}
mild_compile_error = th->mild_compile_error;
- PUSH_TAG();
+ TH_PUSH_TAG(th);
state = EXEC_TAG();
if (state == 0) {
NODE *node;
@@ -613,7 +613,7 @@ rb_load_internal0(rb_thread_t *th, VALUE fname, int wrap)
th->mild_compile_error--;
rb_iseq_eval(iseq);
}
- POP_TAG();
+ TH_POP_TAG();
#if !defined __GNUC__
th = th0;
@@ -965,7 +965,7 @@ rb_require_internal(VALUE fname, int safe)
rb_sourceline());
}
- PUSH_TAG();
+ TH_PUSH_TAG(th);
saved.safe = rb_safe_level();
if ((state = EXEC_TAG()) == 0) {
VALUE path;
@@ -1015,7 +1015,7 @@ rb_require_internal(VALUE fname, int safe)
}
}
}
- POP_TAG();
+ TH_POP_TAG();
load_unlock(ftptr, !state);
rb_set_safe_level_force(saved.safe);