Set a compile time flag so iseq marking knows about markables

tenderlove · tenderlove · commit 6649dc468f94 · 2018-02-15T14:17:30.000-08:00
At compile time, set a flag on the iseq object so that the iseq mark
function knows to skip disassembly for iseqs that have no markables.
diff --git a/compile.c b/compile.c
@@ -2018,6 +2018,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			    rb_hash_rehash(map);
 			    freeze_hide_obj(map);
 			    generated_iseq[code_index + 1 + j] = map;
+			    FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
 			    break;
 			}
 		      case TS_LINDEX:
@@ -2028,13 +2029,19 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			{
 			    VALUE v = operands[j];
 			    generated_iseq[code_index + 1 + j] = v;
+			    if (!SPECIAL_CONST_P(v)) {
+				FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+			    }
 			    break;
 			}
 		      case TS_VALUE:	/* VALUE */
 			{
 			    VALUE v = operands[j];
 			    generated_iseq[code_index + 1 + j] = v;
 			    /* to mark ruby object */
+			    if (!SPECIAL_CONST_P(v)) {
+				FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+			    }
 			    break;
 			}
 		      case TS_IC: /* inline cache */
@@ -2045,6 +2052,9 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->body->is_size);
 			    }
 			    generated_iseq[code_index + 1 + j] = (VALUE)ic;
+			    if (BIN(once) == insn || BIN(trace_once) == insn) {
+				FL_SET(iseq, ISEQ_MARKABLE_ISEQ);
+			    }
 			    break;
 			}
 		      case TS_CALLINFO: /* call info */
diff --git a/iseq.c b/iseq.c
@@ -217,7 +217,10 @@ rb_iseq_mark(const rb_iseq_t *iseq)
     if (iseq->body) {
 	const struct rb_iseq_constant_body *body = iseq->body;
 
-	rb_iseq_each_value(iseq, each_insn_value, NULL);
+	if(FL_TEST(iseq, ISEQ_MARKABLE_ISEQ)) {
+	    rb_iseq_each_value(iseq, each_insn_value, NULL);
+	}
+
 	rb_gc_mark(body->variable.coverage);
 	rb_gc_mark(body->variable.original_iseq);
 	rb_gc_mark(body->location.label);
diff --git a/iseq.h b/iseq.h
@@ -84,6 +84,7 @@ ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t *iseq, long size)
 #define ISEQ_NOT_LOADED_YET   IMEMO_FL_USER1
 #define ISEQ_USE_COMPILE_DATA IMEMO_FL_USER2
 #define ISEQ_TRANSLATED       IMEMO_FL_USER3
+#define ISEQ_MARKABLE_ISEQ    IMEMO_FL_USER4
 
 struct iseq_compile_data {
     /* GC is needed */

Original file line number	Diff line number	Diff line change
`@@ -2018,6 +2018,7 @@ iseq_set_sequence(rb_iseq_t iseq, LINK_ANCHOR const anchor)`
`2018`	`2018`	`rb_hash_rehash(map);`
`2019`	`2019`	`freeze_hide_obj(map);`
`2020`	`2020`	`generated_iseq[code_index + 1 + j] = map;`
	`2021`	`+ FL_SET(iseq, ISEQ_MARKABLE_ISEQ);`
`2021`	`2022`	`break;`
`2022`	`2023`	`}`
`2023`	`2024`	`case TS_LINDEX:`
`@@ -2028,13 +2029,19 @@ iseq_set_sequence(rb_iseq_t iseq, LINK_ANCHOR const anchor)`
`2028`	`2029`	`{`
`2029`	`2030`	`VALUE v = operands[j];`
`2030`	`2031`	`generated_iseq[code_index + 1 + j] = v;`
	`2032`	`+ if (!SPECIAL_CONST_P(v)) {`
	`2033`	`+ FL_SET(iseq, ISEQ_MARKABLE_ISEQ);`
	`2034`	`+ }`
`2031`	`2035`	`break;`
`2032`	`2036`	`}`
`2033`	`2037`	`case TS_VALUE: /* VALUE */`
`2034`	`2038`	`{`
`2035`	`2039`	`VALUE v = operands[j];`
`2036`	`2040`	`generated_iseq[code_index + 1 + j] = v;`
`2037`	`2041`	`/* to mark ruby object */`
	`2042`	`+ if (!SPECIAL_CONST_P(v)) {`
	`2043`	`+ FL_SET(iseq, ISEQ_MARKABLE_ISEQ);`
	`2044`	`+ }`
`2038`	`2045`	`break;`
`2039`	`2046`	`}`
`2040`	`2047`	`case TS_IC: /* inline cache */`
`@@ -2045,6 +2052,9 @@ iseq_set_sequence(rb_iseq_t iseq, LINK_ANCHOR const anchor)`
`2045`	`2052`	`rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->body->is_size);`
`2046`	`2053`	`}`
`2047`	`2054`	`generated_iseq[code_index + 1 + j] = (VALUE)ic;`
	`2055`	`+ if (BIN(once) == insn \|\| BIN(trace_once) == insn) {`
	`2056`	`+ FL_SET(iseq, ISEQ_MARKABLE_ISEQ);`
	`2057`	`+ }`
`2048`	`2058`	`break;`
`2049`	`2059`	`}`
`2050`	`2060`	`case TS_CALLINFO: /* call info */`