[前][次][番号順一覧][スレッド一覧]

ruby-changes:71184

From: Peter <ko1@a...>
Date: Mon, 14 Feb 2022 23:36:15 +0900 (JST)
Subject: [ruby-changes:71184] 26187a8520 (master): Use RARRAY_SHARED_ROOT_FLAG for checking re-enter

https://git.ruby-lang.org/ruby.git/commit/?id=26187a8520

From 26187a8520b8c6645206a2064c11a7ab86a89845 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@p...>
Date: Fri, 11 Feb 2022 15:44:08 -0500
Subject: Use RARRAY_SHARED_ROOT_FLAG for checking re-enter

RARRAY_SHARED_ROOT_FLAG is defined as FL_USER5, but we should use
RARRAY_SHARED_ROOT_FLAG instead of depending on that they're equal.
---
 array.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/array.c b/array.c
index 82d374d0ba..a7d635eff7 100644
--- a/array.c
+++ b/array.c
@@ -7230,13 +7230,13 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) https://github.com/ruby/ruby/blob/trunk/array.c#L7230
 
 	/* put it on the result array */
 	if (NIL_P(result)) {
-	    FL_SET(t0, FL_USER5);
+            FL_SET(t0, RARRAY_SHARED_ROOT_FLAG);
 	    rb_yield(subarray);
-	    if (! FL_TEST(t0, FL_USER5)) {
+            if (!FL_TEST(t0, RARRAY_SHARED_ROOT_FLAG)) {
 		rb_raise(rb_eRuntimeError, "product reentered");
 	    }
 	    else {
-		FL_UNSET(t0, FL_USER5);
+                FL_UNSET(t0, RARRAY_SHARED_ROOT_FLAG);
 	    }
 	}
 	else {
-- 
cgit v1.2.1


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

[前][次][番号順一覧][スレッド一覧]