ko1	2015-03-11 03:53:28 +0900 (Wed, 11 Mar 2015)

  New Revision: 49923

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49923

  Log:
    * eval_intern.h (THROW_DATA_P): use RB_TYPE_P() instead of
      BUILTIN_TYPE().
    * thread.c (thread_join): use THROW_DATA_P().

  Modified files:
    trunk/ChangeLog
    trunk/eval_intern.h
    trunk/thread.c
Index: eval_intern.h
===================================================================
--- eval_intern.h	(revision 49922)
+++ eval_intern.h	(revision 49923)
@@ -199,7 +199,7 @@ enum ruby_tag_type { https://github.com/ruby/ruby/blob/trunk/eval_intern.h#L199
 #define TAG_FATAL	RUBY_TAG_FATAL
 #define TAG_MASK	RUBY_TAG_MASK
 
-#define THROW_DATA_P(err) (BUILTIN_TYPE(err) == T_NODE)
+#define THROW_DATA_P(err) RB_TYPE_P((err), T_NODE)
 
 #define SCOPE_TEST(f)  (CREF_VISI(rb_vm_cref()) & (f))
 #define SCOPE_CHECK(f) (CREF_VISI(rb_vm_cref()) == (f))
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49922)
+++ ChangeLog	(revision 49923)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Mar 11 03:52:12 2015  Koichi Sasada  <ko1@a...>
+
+	* eval_intern.h (THROW_DATA_P): use RB_TYPE_P() instead of
+	  BUILTIN_TYPE(). 
+
+	* thread.c (thread_join): use THROW_DATA_P().
+
 Wed Mar 11 03:48:01 2015  Koichi Sasada  <ko1@a...>
 
 	* proc.c: use RUBY_VM_IFUNC_P() to recognize IFUNC or not.
@@ -8,7 +15,8 @@ Wed Mar 11 03:48:01 2015  Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ChangeLog#L15
 
 	* vm_insnhelper.c: ditto.
 
-	* vm_core.h: use RB_TYPE_P() instead of BUILTIN_TYPE().
+	* vm_core.h (RUBY_VM_IFUNC_P): use RB_TYPE_P() instead of
+	  BUILTIN_TYPE().
 
 Wed Mar 11 03:21:37 2015  Koichi Sasada  <ko1@a...>
 
Index: thread.c
===================================================================
--- thread.c	(revision 49922)
+++ thread.c	(revision 49923)
@@ -892,8 +892,8 @@ thread_join(rb_thread_t *target_th, doub https://github.com/ruby/ruby/blob/trunk/thread.c#L892
 		rb_bug("thread_join: Fixnum (%d) should not reach here.", FIX2INT(err));
 	    }
 	}
-	else if (RB_TYPE_P(target_th->errinfo, T_NODE)) {
-	    rb_bug("thread_join: NODE should not reach here.");
+	else if (THROW_DATA_P(target_th->errinfo)) {
+	    rb_bug("thread_join: THROW_DATA should not reach here.");
 	}
 	else {
 	    /* normal exception */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/