aboutsummaryrefslogtreecommitdiffstats
path: root/array.c
diff options
context:
space:
mode:
authorYusuke Endoh <mame@ruby-lang.org>2019-07-19 23:41:24 +0900
committerYusuke Endoh <mame@ruby-lang.org>2019-07-19 23:41:24 +0900
commit3e8d4ff3e571bd556898efd94badb66a5dadf4d2 (patch)
tree822c90aea2b55e7a9c44ef70f2052ce91180d8c1 /array.c
parent0a7093a8e9277d9f459b2c14f2eade02eed15e28 (diff)
downloadruby-3e8d4ff3e571bd556898efd94badb66a5dadf4d2.tar.gz
array.c: factor out `assert(RB_TYPE_P(ary, T_ARRAY))` to a function
The assertion blows up gcc 8 by consuming approx. 1.8 GB memory. This change reduces the amount of memory required to about 200 MB. A follow-up of ae750799c1b28b06d02e50cd26450b9903516526.
Diffstat (limited to 'array.c')
-rw-r--r--array.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/array.c b/array.c
index ffeb884134..a4652e6eb9 100644
--- a/array.c
+++ b/array.c
@@ -34,13 +34,19 @@ VALUE rb_cArray;
#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
#define SMALL_ARRAY_LEN 16
+static void
+assert_T_ARRAY(VALUE ary)
+{
+ assert(RB_TYPE_P(ary, T_ARRAY));
+}
+
#define ARY_SHARED_P(ary) \
- (assert(RB_TYPE_P((VALUE)(ary), T_ARRAY)), \
+ (assert_T_ARRAY((VALUE)(ary)), \
assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
FL_TEST_RAW((ary),ELTS_SHARED)!=0)
#define ARY_EMBED_P(ary) \
- (assert(RB_TYPE_P((VALUE)(ary), T_ARRAY)), \
+ (assert_T_ARRAY((VALUE)(ary)), \
assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
FL_TEST_RAW((ary), RARRAY_EMBED_FLAG) != 0)
@@ -56,7 +62,7 @@ VALUE rb_cArray;
(RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), ARY_CAPA(a) * sizeof(VALUE))
-#define ARY_OWNS_HEAP_P(a) (assert(RB_TYPE_P((a), T_ARRAY)), \
+#define ARY_OWNS_HEAP_P(a) (assert_T_ARRAY((VALUE)(a)), \
!FL_TEST_RAW((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
#define FL_SET_EMBED(a) do { \
@@ -132,7 +138,7 @@ VALUE rb_cArray;
RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared_root, _value_); \
} while (0)
#define RARRAY_SHARED_ROOT_FLAG FL_USER5
-#define ARY_SHARED_ROOT_P(ary) (assert(RB_TYPE_P((ary), T_ARRAY)), \
+#define ARY_SHARED_ROOT_P(ary) (assert_T_ARRAY((VALUE)(ary)), \
FL_TEST_RAW((ary), RARRAY_SHARED_ROOT_FLAG))
#define ARY_SHARED_ROOT_REFCNT(ary) \
(assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)