From 1939d097e650a60557eafbd89a6684f4626e0ad5 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 26 Jun 2017 07:56:44 +0000 Subject: move several fields from rb_thread_t to rb_execution_context_t. * vm_core.h (rb_thread_t): move several fields which are copied at cont.c to rb_execution_context_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- safe.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'safe.c') diff --git a/safe.c b/safe.c index 7aae978272..d938082d64 100644 --- a/safe.c +++ b/safe.c @@ -34,13 +34,13 @@ ruby_safe_level_2_warning(void) int rb_safe_level(void) { - return GET_THREAD()->safe_level; + return GET_THREAD()->ec.safe_level; } void rb_set_safe_level_force(int safe) { - GET_THREAD()->safe_level = safe; + GET_THREAD()->ec.safe_level = safe; } void @@ -48,11 +48,11 @@ rb_set_safe_level(int level) { rb_thread_t *th = GET_THREAD(); - if (level > th->safe_level) { + if (level > th->ec.safe_level) { if (level > SAFE_LEVEL_MAX) { rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete"); } - th->safe_level = level; + th->ec.safe_level = level; } } @@ -68,15 +68,15 @@ safe_setter(VALUE val) int level = NUM2INT(val); rb_thread_t *th = GET_THREAD(); - if (level < th->safe_level) { + if (level < th->ec.safe_level) { rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d", - th->safe_level, level); + th->ec.safe_level, level); } if (level > SAFE_LEVEL_MAX) { rb_raise(rb_eArgError, "$SAFE=2 to 4 are obsolete"); } - th->safe_level = level; + th->ec.safe_level = level; } void -- cgit v1.2.3