oj 3.7.4 → 3.13.21

data/ext/oj/dump_compat.c

@@ -1,7 +1,5 @@
-/* dump_object.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license details.
 
 #include "code.h"
 #include "dump.h"
@@ -34,21 +32,17 @@ dump_obj_classname(const char *classname, int depth, Out out) {
     *out->cur++ = '{';
     fill_indent(out, d2);
     *out->cur++ = '"';
-    memcpy(out->cur, out->opts->create_id, out->opts->create_id_len);
-    out->cur += out->opts->create_id_len;
+    APPEND_CHARS(out->cur, out->opts->create_id, out->opts->create_id_len);
     *out->cur++ = '"';
     if (0 < out->opts->dump_opts.before_size) {
-	strcpy(out->cur, out->opts->dump_opts.before_sep);
-	out->cur += out->opts->dump_opts.before_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
     }
     *out->cur++ = ':';
     if (0 < out->opts->dump_opts.after_size) {
-	strcpy(out->cur, out->opts->dump_opts.after_sep);
-	out->cur += out->opts->dump_opts.after_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
     }
     *out->cur++ = '"';
-    memcpy(out->cur, classname, len);
-    out->cur += len;
+    APPEND_CHARS(out->cur, classname, len);
     *out->cur++ = '"';
 }
 
@@ -64,25 +58,22 @@ dump_values_array(VALUE *values, int depth, Out out) {
     } else {
 	if (out->opts->dump_opts.use) {
 	    size = d2 * out->opts->dump_opts.indent_size + out->opts->dump_opts.array_size + 2;
-	} else {
-	    size = d2 * out->indent + 3;
-	}
-	if (out->opts->dump_opts.use) {
 	    size += out->opts->dump_opts.array_size;
 	    size += out->opts->dump_opts.indent_size;
+	} else {
+	    size = d2 * out->indent + 3;
 	}
 	for (; Qundef != *values; values++) {
 	    assure_size(out, size);
 	    if (out->opts->dump_opts.use) {
 		if (0 < out->opts->dump_opts.array_size) {
-		    strcpy(out->cur, out->opts->dump_opts.array_nl);
-		    out->cur += out->opts->dump_opts.array_size;
+		    APPEND_CHARS(out->cur, out->opts->dump_opts.array_nl, out->opts->dump_opts.array_size);
 		}
 		if (0 < out->opts->dump_opts.indent_size) {
 		    int	i;
+
 		    for (i = d2; 0 < i; i--) {
-			strcpy(out->cur, out->opts->dump_opts.indent_str);
-			out->cur += out->opts->dump_opts.indent_size;
+			APPEND_CHARS(out->cur, out->opts->dump_opts.indent_str, out->opts->dump_opts.indent_size);
 		    }
 		}
 	    } else {
@@ -96,15 +87,13 @@ dump_values_array(VALUE *values, int depth, Out out) {
 	assure_size(out, size);
 	if (out->opts->dump_opts.use) {
 	    if (0 < out->opts->dump_opts.array_size) {
-		strcpy(out->cur, out->opts->dump_opts.array_nl);
-		out->cur += out->opts->dump_opts.array_size;
+		APPEND_CHARS(out->cur, out->opts->dump_opts.array_nl, out->opts->dump_opts.array_size);
 	    }
 	    if (0 < out->opts->dump_opts.indent_size) {
 		int	i;
 
 		for (i = depth; 0 < i; i--) {
-		    strcpy(out->cur, out->opts->dump_opts.indent_str);
-		    out->cur += out->opts->dump_opts.indent_size;
+		    APPEND_CHARS(out->cur, out->opts->dump_opts.indent_str, out->opts->dump_opts.indent_size);
 		}
 	    }
 	} else {
@@ -120,7 +109,7 @@ dump_to_json(VALUE obj, Out out) {
     const char		*s;
     int			len;
 
-    if (Yes == out->opts->trace) {
+    if (RB_UNLIKELY(Yes == out->opts->trace)) {
 	oj_trace("to_json", obj, __FILE__, __LINE__, 0, TraceRubyIn);
     }
     if (0 == rb_obj_method_arity(obj, oj_to_json_id)) {
@@ -128,16 +117,15 @@ dump_to_json(VALUE obj, Out out) {
     } else {
 	rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
     }
-    if (Yes == out->opts->trace) {
+    if (RB_UNLIKELY(Yes == out->opts->trace)) {
 	oj_trace("to_json", obj, __FILE__, __LINE__, 0, TraceRubyOut);
     }
 
-    s = rb_string_value_ptr((VALUE*)&rs);
+    s = RSTRING_PTR(rs);
     len = (int)RSTRING_LEN(rs);
 
     assure_size(out, len + 1);
-    memcpy(out->cur, s, len);
-    out->cur += len;
+    APPEND_CHARS(out->cur, s, len);
     *out->cur = '\0';
 }
 
@@ -155,7 +143,7 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
     if (as_ok && !oj_use_hash_alt && rb_obj_class(a) != rb_cArray && rb_respond_to(a, oj_to_json_id)) {
 	dump_to_json(a, out);
 	return;
-    }	
+    }
     cnt = (int)RARRAY_LEN(a);
     *out->cur++ = '[';
     assure_size(out, 2);
@@ -167,45 +155,43 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 	} else {
 	    size = d2 * out->indent + 2;
 	}
+	assure_size(out, size * cnt);
 	cnt--;
 	for (i = 0; i <= cnt; i++) {
-	    assure_size(out, size);
 	    if (out->opts->dump_opts.use) {
 		if (0 < out->opts->dump_opts.array_size) {
-		    strcpy(out->cur, out->opts->dump_opts.array_nl);
-		    out->cur += out->opts->dump_opts.array_size;
+		    APPEND_CHARS(out->cur, out->opts->dump_opts.array_nl, out->opts->dump_opts.array_size);
 		}
 		if (0 < out->opts->dump_opts.indent_size) {
 		    int	i;
 		    for (i = d2; 0 < i; i--) {
-			strcpy(out->cur, out->opts->dump_opts.indent_str);
-			out->cur += out->opts->dump_opts.indent_size;
+			APPEND_CHARS(out->cur, out->opts->dump_opts.indent_str, out->opts->dump_opts.indent_size);
 		    }
 		}
 	    } else {
 		fill_indent(out, d2);
 	    }
-	    oj_dump_compat_val(rb_ary_entry(a, i), d2, out, true);
+	    oj_dump_compat_val(RARRAY_AREF(a, i), d2, out, true);
 	    if (i < cnt) {
 		*out->cur++ = ',';
 	    }
 	}
-	size = depth * out->indent + 1;
-	assure_size(out, size);
 	if (out->opts->dump_opts.use) {
+	    size = out->opts->dump_opts.array_size + out->opts->dump_opts.indent_size * depth + 1;
+	    assure_size(out, size);
 	    if (0 < out->opts->dump_opts.array_size) {
-		strcpy(out->cur, out->opts->dump_opts.array_nl);
-		out->cur += out->opts->dump_opts.array_size;
+		APPEND_CHARS(out->cur, out->opts->dump_opts.array_nl, out->opts->dump_opts.array_size);
 	    }
 	    if (0 < out->opts->dump_opts.indent_size) {
 		int	i;
 
 		for (i = depth; 0 < i; i--) {
-		    strcpy(out->cur, out->opts->dump_opts.indent_str);
-		    out->cur += out->opts->dump_opts.indent_size;
+		    APPEND_CHARS(out->cur, out->opts->dump_opts.indent_str, out->opts->dump_opts.indent_size);
 		}
 	    }
 	} else {
+	    size = depth * out->indent + 1;
+	    assure_size(out, size);
 	    fill_indent(out, depth);
 	}
 	*out->cur++ = ']';
@@ -217,7 +203,7 @@ static ID	_dump_id = 0;
 
 static void
 bigdecimal_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "b", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -235,7 +221,7 @@ static ID	imag_id = 0;
 
 static void
 complex_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "r", 1, Qnil },
 	{ "i", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -258,7 +244,7 @@ static ID	start_id = 0;
 
 static void
 date_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "y", 1, Qnil },
 	{ "m", 1, Qnil },
 	{ "d", 1, Qnil },
@@ -286,7 +272,7 @@ static ID	offset_id = 0;
 
 static void
 datetime_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "y", 1, Qnil },
 	{ "m", 1, Qnil },
 	{ "d", 1, Qnil },
@@ -337,33 +323,25 @@ exception_alt(VALUE obj, int depth, Out out) {
     assure_size(out, size + sep_len + 6);
     *out->cur++ = ',';
     fill_indent(out, d3);
-    *out->cur++ = '"';
-    *out->cur++ = 'm';
-    *out->cur++ = '"';
+    APPEND_CHARS(out->cur, "\"m\"", 3);
     if (0 < out->opts->dump_opts.before_size) {
-	strcpy(out->cur, out->opts->dump_opts.before_sep);
-	out->cur += out->opts->dump_opts.before_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
     }
     *out->cur++ = ':';
     if (0 < out->opts->dump_opts.after_size) {
-	strcpy(out->cur, out->opts->dump_opts.after_sep);
-	out->cur += out->opts->dump_opts.after_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
     }
     oj_dump_str(rb_funcall(obj, message_id, 0), 0, out, false);
     assure_size(out, size + sep_len + 6);
     *out->cur++ = ',';
     fill_indent(out, d3);
-    *out->cur++ = '"';
-    *out->cur++ = 'b';
-    *out->cur++ = '"';
+    APPEND_CHARS(out->cur, "\"b\"", 3);
     if (0 < out->opts->dump_opts.before_size) {
-	strcpy(out->cur, out->opts->dump_opts.before_sep);
-	out->cur += out->opts->dump_opts.before_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
     }
     *out->cur++ = ':';
     if (0 < out->opts->dump_opts.after_size) {
-	strcpy(out->cur, out->opts->dump_opts.after_sep);
-	out->cur += out->opts->dump_opts.after_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
     }
     dump_array(rb_funcall(obj, backtrace_id, 0), depth, out, false);
     fill_indent(out, depth);
@@ -375,7 +353,7 @@ static ID	table_id = 0;
 
 static void
 openstruct_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "t", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -399,17 +377,13 @@ range_alt(VALUE obj, int depth, Out out) {
     assure_size(out, size + sep_len + 6);
     *out->cur++ = ',';
     fill_indent(out, d3);
-    *out->cur++ = '"';
-    *out->cur++ = 'a';
-    *out->cur++ = '"';
+    APPEND_CHARS(out->cur, "\"a\"", 3);
     if (0 < out->opts->dump_opts.before_size) {
-	strcpy(out->cur, out->opts->dump_opts.before_sep);
-	out->cur += out->opts->dump_opts.before_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
     }
     *out->cur++ = ':';
     if (0 < out->opts->dump_opts.after_size) {
-	strcpy(out->cur, out->opts->dump_opts.after_sep);
-	out->cur += out->opts->dump_opts.after_size;
+	APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
     }
     args[0] = rb_funcall(obj, oj_begin_id, 0);
     args[1] = rb_funcall(obj, oj_end_id, 0);
@@ -425,7 +399,7 @@ static ID	denominator_id = 0;
 
 static void
 rational_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "n", 1, Qnil },
 	{ "d", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -445,7 +419,7 @@ static ID	source_id = 0;
 
 static void
 regexp_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "o", 1, Qnil },
 	{ "s", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -462,7 +436,7 @@ regexp_alt(VALUE obj, int depth, Out out) {
 
 static void
 time_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "s", 1, Qundef, 0, Qundef },
 	{ "n", 1, Qundef, 0, Qundef },
 	{ NULL, 0, Qnil },
@@ -470,16 +444,15 @@ time_alt(VALUE obj, int depth, Out out) {
     time_t	sec;
     long long	nsec;
 
-#ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
-	sec = ts.tv_sec;
+
+	sec = (long long)ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = NUM2LL(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = NUM2LL(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
-#else
-    sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#endif
 
     attrs[0].num = sec;
     attrs[1].num = nsec;
@@ -487,7 +460,7 @@ time_alt(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out, true);
 }
 
-struct _Code	oj_compat_codes[] = {
+struct _code	oj_compat_codes[] = {
     { "BigDecimal", Qnil, bigdecimal_alt, NULL, false },
     { "Complex", Qnil, complex_alt, NULL, false },
     { "Date", Qnil, date_alt, false },
@@ -610,18 +583,21 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
     } else if (OJ_INFINITY == d) {
 	if (WordNan == out->opts->dump_opts.nan_dump) {
 	    strcpy(buf, "Infinity");
+	    cnt = 8;
 	} else {
 	    raise_json_err("Infinity not allowed in JSON.", "GeneratorError");
 	}
     } else if (-OJ_INFINITY == d) {
 	if (WordNan == out->opts->dump_opts.nan_dump) {
 	    strcpy(buf, "-Infinity");
+	    cnt = 9;
 	} else {
 	    raise_json_err("-Infinity not allowed in JSON.", "GeneratorError");
 	}
     } else if (isnan(d)) {
 	if (WordNan == out->opts->dump_opts.nan_dump) {
 	    strcpy(buf, "NaN");
+	    cnt = 3;
 	} else {
 	    raise_json_err("NaN not allowed in JSON.", "GeneratorError");
 	}
@@ -632,18 +608,17 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
     } else {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	strcpy(buf, rb_string_value_ptr((VALUE*)&rstr));
+	strcpy(buf, RSTRING_PTR(rstr));
 	cnt = (int)RSTRING_LEN(rstr);
     }
     assure_size(out, cnt);
-    for (b = buf; '\0' != *b; b++) {
-	*out->cur++ = *b;
-    }
+    APPEND_CHARS(out->cur, buf, cnt);
     *out->cur = '\0';
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
     int	depth = out->depth;
 
     if (out->omit_nil && Qnil == value) {
@@ -655,14 +630,12 @@ hash_cb(VALUE key, VALUE value, Out out) {
     } else {
 	assure_size(out, depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1);
 	if (0 < out->opts->dump_opts.hash_size) {
-	    strcpy(out->cur, out->opts->dump_opts.hash_nl);
-	    out->cur += out->opts->dump_opts.hash_size;
+	    APPEND_CHARS(out->cur, out->opts->dump_opts.hash_nl, out->opts->dump_opts.hash_size);
 	}
 	if (0 < out->opts->dump_opts.indent_size) {
 	    int	i;
 	    for (i = depth; 0 < i; i--) {
-		strcpy(out->cur, out->opts->dump_opts.indent_str);
-		out->cur += out->opts->dump_opts.indent_size;
+		APPEND_CHARS(out->cur, out->opts->dump_opts.indent_str, out->opts->dump_opts.indent_size);
 	    }
 	}
     }
@@ -683,13 +656,11 @@ hash_cb(VALUE key, VALUE value, Out out) {
     } else {
 	assure_size(out, out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2);
 	if (0 < out->opts->dump_opts.before_size) {
-	    strcpy(out->cur, out->opts->dump_opts.before_sep);
-	    out->cur += out->opts->dump_opts.before_size;
+	    APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
 	}
 	*out->cur++ = ':';
 	if (0 < out->opts->dump_opts.after_size) {
-	    strcpy(out->cur, out->opts->dump_opts.after_sep);
-	    out->cur += out->opts->dump_opts.after_size;
+	    APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
 	}
     }
     oj_dump_compat_val(value, depth, out, true);
@@ -711,12 +682,11 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
     if (as_ok && !oj_use_hash_alt && rb_obj_class(obj) != rb_cHash && rb_respond_to(obj, oj_to_json_id)) {
 	dump_to_json(obj, out);
 	return;
-    }	
+    }
     cnt = (int)RHASH_SIZE(obj);
     assure_size(out, 2);
     if (0 == cnt) {
-	*out->cur++ = '{';
-	*out->cur++ = '}';
+	APPEND_CHARS(out->cur, "{}", 2);
     } else {
 	*out->cur++ = '{';
 	out->depth = depth + 1;
@@ -730,15 +700,13 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 	} else {
 	    assure_size(out, depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1);
 	    if (0 < out->opts->dump_opts.hash_size) {
-		strcpy(out->cur, out->opts->dump_opts.hash_nl);
-		out->cur += out->opts->dump_opts.hash_size;
+		APPEND_CHARS(out->cur, out->opts->dump_opts.hash_nl, out->opts->dump_opts.hash_size);
 	    }
 	    if (0 < out->opts->dump_opts.indent_size) {
 		int	i;
 
 		for (i = depth; 0 < i; i--) {
-		    strcpy(out->cur, out->opts->dump_opts.indent_str);
-		    out->cur += out->opts->dump_opts.indent_size;
+		    APPEND_CHARS(out->cur, out->opts->dump_opts.indent_str, out->opts->dump_opts.indent_size);
 		}
 	    }
 	}
@@ -758,9 +726,12 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	exception_alt(obj, depth, out);
 	return;
     }
+    if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
+	oj_dump_raw_json(obj, depth, out);
+	return;
+    }
     if (as_ok && rb_respond_to(obj, oj_to_json_id)) {
 	dump_to_json(obj, out);
-
 	return;
     }
     // Nothing else matched so encode as a JSON object with Ruby obj members
@@ -779,8 +750,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	*out->cur++ = '"';
 	oj_dump_compat_val(rb_funcall(obj, oj_begin_id, 0), 0, out, false);
 	assure_size(out, 3);
-	*out->cur++ = '.';
-	*out->cur++ = '.';
+	APPEND_CHARS(out->cur, "..", 2);
 	if (Qtrue == rb_funcall(obj, oj_exclude_end_id, 0)) {
 	    *out->cur++ = '.';
 	}
@@ -826,17 +796,13 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	assure_size(out, size + sep_len + 6);
 	*out->cur++ = ',';
 	fill_indent(out, d3);
-	*out->cur++ = '"';
-	*out->cur++ = 'v';
-	*out->cur++ = '"';
+	APPEND_CHARS(out->cur, "\"v\"", 3);
 	if (0 < out->opts->dump_opts.before_size) {
-	    strcpy(out->cur, out->opts->dump_opts.before_sep);
-	    out->cur += out->opts->dump_opts.before_size;
+	    APPEND_CHARS(out->cur, out->opts->dump_opts.before_sep, out->opts->dump_opts.before_size);
 	}
 	*out->cur++ = ':';
 	if (0 < out->opts->dump_opts.after_size) {
-	    strcpy(out->cur, out->opts->dump_opts.after_sep);
-	    out->cur += out->opts->dump_opts.after_size;
+	    APPEND_CHARS(out->cur, out->opts->dump_opts.after_sep, out->opts->dump_opts.after_size);
 	}
 	for (i = 0; i < cnt; i++) {
 #ifdef RSTRUCT_LEN
@@ -862,7 +828,7 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     // this must use to_s to pass the json gem unit tests.
     volatile VALUE	rs;
     int			cnt;
-	bool		dump_as_string = false;
+    bool		dump_as_string = false;
 
     if (use_bignum_alt) {
 	rs = rb_big2str(obj, 10);
@@ -872,21 +838,17 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     rb_check_type(rs, T_STRING);
     cnt = (int)RSTRING_LEN(rs);
 
-	if (out->opts->integer_range_min != 0 || out->opts->integer_range_max != 0) {
+    if (out->opts->int_range_min != 0 || out->opts->int_range_max != 0) {
 	dump_as_string = true; // Bignum cannot be inside of Fixnum range
 	assure_size(out, cnt + 2);
 	*out->cur++ = '"';
-	} else {
+    } else {
 	assure_size(out, cnt);
-	}
-
-    memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
-    out->cur += cnt;
-
-	if(dump_as_string) {
+    }
+    APPEND_CHARS(out->cur, RSTRING_PTR(rs), cnt);
+    if (dump_as_string) {
 	*out->cur++ = '"';
-	}
-
+    }
     *out->cur = '\0';
 }
 
@@ -931,7 +893,7 @@ void
 oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok) {
     int	type = rb_type(obj);
 
-    if (Yes == out->opts->trace) {
+    if (RB_UNLIKELY(Yes == out->opts->trace)) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
     }
     if (out->opts->dump_opts.max_depth <= depth) {
@@ -956,14 +918,14 @@ oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok) {
 
 	if (NULL != f) {
 	    f(obj, depth, out, as_ok);
-	    if (Yes == out->opts->trace) {
+	    if (RB_UNLIKELY(Yes == out->opts->trace)) {
 		oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
 	    }
 	    return;
 	}
     }
     oj_dump_nil(Qnil, depth, out, false);
-    if (Yes == out->opts->trace) {
+    if (RB_UNLIKELY(Yes == out->opts->trace)) {
 	oj_trace("dump", Qnil, __FILE__, __LINE__, depth, TraceOut);
     }
 }