Merge pull request #208 from Shopify/add_darray_clear

maximecb · web-flow · commit 5cb9bd580d18 · 2021-09-09T17:14:17.000-07:00
Add rb_darray_clear() for Kevin. Fix some warnings.
diff --git a/darray.h b/darray.h
@@ -84,6 +84,11 @@
 //
 #define rb_darray_make(ptr_to_ary, size) rb_darray_make_impl((ptr_to_ary), size, sizeof(**(ptr_to_ary)), sizeof((*(ptr_to_ary))->data[0]))
 
+// Set the size of the array to zero without freeing the backing memory.
+// Allows reusing the same array.
+//
+#define rb_darray_clear(ary) (ary->meta.size = 0)
+
 typedef struct rb_darray_meta {
     int32_t size;
     int32_t capa;
diff --git a/yjit_codegen.c b/yjit_codegen.c
@@ -142,6 +142,7 @@ jit_peek_at_self(jitstate_t *jit, ctx_t *ctx)
     return jit->ec->cfp->self;
 }
 
+RBIMPL_ATTR_MAYBE_UNUSED()
 static VALUE
 jit_peek_at_local(jitstate_t *jit, ctx_t *ctx, int n)
 {
@@ -985,7 +986,7 @@ gen_expandarray(jitstate_t* jit, ctx_t* ctx)
 
     // num is the number of requested values. If there aren't enough in the
     // array then we're going to push on nils.
-    rb_num_t num = (rb_num_t) jit_get_arg(jit, 0);
+    int num = (int)jit_get_arg(jit, 0);
     val_type_t array_type = ctx_get_opnd_type(ctx, OPND_STACK(0));
     x86opnd_t array_opnd = ctx_stack_pop(ctx, 1);
 

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ jit_peek_at_self(jitstate_t jit, ctx_t ctx)`
`142`	`142`	`return jit->ec->cfp->self;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+RBIMPL_ATTR_MAYBE_UNUSED()`
`145`	`146`	`static VALUE`
`146`	`147`	`jit_peek_at_local(jitstate_t jit, ctx_t ctx, int n)`
`147`	`148`	`{`
`@@ -985,7 +986,7 @@ gen_expandarray(jitstate_t* jit, ctx_t* ctx)`
`985`	`986`
`986`	`987`	`// num is the number of requested values. If there aren't enough in the`
`987`	`988`	`// array then we're going to push on nils.`
`988`		`- rb_num_t num = (rb_num_t) jit_get_arg(jit, 0);`
	`989`	`+ int num = (int)jit_get_arg(jit, 0);`
`989`	`990`	`val_type_t array_type = ctx_get_opnd_type(ctx, OPND_STACK(0));`
`990`	`991`	`x86opnd_t array_opnd = ctx_stack_pop(ctx, 1);`
`991`	`992`