Make gen_opt_aref() delegate to gen_opt_send_without_block() (#9)

XrXr · web-flow · commit 07240e909cfc · 2021-04-22T22:11:44.000-04:00
Basically mirroring the interpreter for the general case.
diff --git a/yjit_codegen.c b/yjit_codegen.c
@@ -1124,6 +1124,8 @@ gen_opt_gt(jitstate_t* jit, ctx_t* ctx)
     return gen_fixnum_cmp(jit, ctx, cmovg);
 }
 
+static codegen_status_t gen_opt_send_without_block(jitstate_t *jit, ctx_t *ctx);
+
 static codegen_status_t
 gen_opt_aref(jitstate_t *jit, ctx_t *ctx)
 {
@@ -1265,8 +1267,10 @@ gen_opt_aref(jitstate_t *jit, ctx_t *ctx)
         jit_jump_to_next_insn(jit, ctx);
         return YJIT_END_BLOCK;
     }
-
-    return YJIT_CANT_COMPILE;
+    else {
+        // General case. Call the [] method.
+        return gen_opt_send_without_block(jit, ctx);
+    }
 }
 
 static codegen_status_t

Original file line number	Diff line number	Diff line change
`@@ -1124,6 +1124,8 @@ gen_opt_gt(jitstate_t* jit, ctx_t* ctx)`
`1124`	`1124`	`return gen_fixnum_cmp(jit, ctx, cmovg);`
`1125`	`1125`	`}`
`1126`	`1126`
	`1127`	`+static codegen_status_t gen_opt_send_without_block(jitstate_t jit, ctx_t ctx);`
	`1128`	`+`
`1127`	`1129`	`static codegen_status_t`
`1128`	`1130`	`gen_opt_aref(jitstate_t jit, ctx_t ctx)`
`1129`	`1131`	`{`
`@@ -1265,8 +1267,10 @@ gen_opt_aref(jitstate_t jit, ctx_t ctx)`
`1265`	`1267`	`jit_jump_to_next_insn(jit, ctx);`
`1266`	`1268`	`return YJIT_END_BLOCK;`
`1267`	`1269`	`}`
`1268`		`-`
`1269`		`- return YJIT_CANT_COMPILE;`
	`1270`	`+ else {`
	`1271`	`+ // General case. Call the [] method.`
	`1272`	`+ return gen_opt_send_without_block(jit, ctx);`
	`1273`	`+ }`
`1270`	`1274`	`}`
`1271`	`1275`
`1272`	`1276`	`static codegen_status_t`