* eval_error.c (error_print), vm_eval.c (eval_string_with_cref),

  vm_trace.c (rb_suppress_tracing): use TH_PUSH_TAG() instead of
  PUSH_TAG().



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 18 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index f1381e39fa..57a2a04626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 24 05:41:18 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* eval_error.c (error_print), vm_eval.c (eval_string_with_cref),
+	  vm_trace.c (rb_suppress_tracing): use TH_PUSH_TAG() instead of
+	  PUSH_TAG().
+
 Wed Oct 24 05:17:52 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_eval.c (vm_call0_body): remove RUBY_VM_CHECK_INTS()
diff --git a/eval_error.c b/eval_error.c
index dc9e99d4f5..76140fcded 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -89,14 +89,14 @@ error_print(void)
 	return;
     rb_thread_raised_clear(th);
 
-    PUSH_TAG();
-    if (EXEC_TAG() == 0) {
+    TH_PUSH_TAG(th);
+    if (TH_EXEC_TAG() == 0) {
 	errat = get_backtrace(errinfo);
     }
     else {
 	errat = Qnil;
     }
-    if (EXEC_TAG())
+    if (TH_EXEC_TAG())
 	goto error;
     if (NIL_P(errat)) {
 	const char *file = rb_sourcefile();
@@ -122,7 +122,7 @@ error_print(void)
     }
 
     eclass = CLASS_OF(errinfo);
-    if (EXEC_TAG() == 0) {
+    if (TH_EXEC_TAG() == 0) {
 	e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
 	StringValue(e);
 	einfo = RSTRING_PTR(e);
@@ -132,7 +132,7 @@ error_print(void)
 	einfo = "";
 	elen = 0;
     }
-    if (EXEC_TAG())
+    if (TH_EXEC_TAG())
 	goto error;
     if (eclass == rb_eRuntimeError && elen == 0) {
 	warn_print(": unhandled exception\n");
@@ -192,7 +192,7 @@ error_print(void)
 	}
     }
   error:
-    POP_TAG();
+    TH_POP_TAG();
     rb_thread_raised_set(th, raised_flag);
 }
 
diff --git a/vm_eval.c b/vm_eval.c
index 1224a8da7f..64cd9283d3 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1096,8 +1096,8 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 
     parse_in_eval = th->parse_in_eval;
     mild_compile_error = th->mild_compile_error;
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    TH_PUSH_TAG(th);
+    if ((state = TH_EXEC_TAG()) == 0) {
 	rb_iseq_t *iseq;
 	volatile VALUE iseqval;
 
@@ -1156,7 +1156,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 	CHECK_STACK_OVERFLOW(th->cfp, iseq->stack_max);
 	result = vm_exec(th);
     }
-    POP_TAG();
+    TH_POP_TAG();
     th->mild_compile_error = mild_compile_error;
     th->parse_in_eval = parse_in_eval;
 
diff --git a/vm_trace.c b/vm_trace.c
index 37610c2bfc..a1498a8511 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -372,11 +372,11 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg)
     outer_state = th->state;
     th->state = 0;
 
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    TH_PUSH_TAG(th);
+    if ((state = TH_EXEC_TAG()) == 0) {
 	result = (*func)(arg);
     }
-    POP_TAG();
+    TH_POP_TAG();
 
     if (raised) {
 	rb_threadptr_set_raised(th);