Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for easy-to-handle cases of block param #24

Merged
merged 1 commit into from
May 6, 2021
Merged

Check for easy-to-handle cases of block param #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions bootstraptest/test_yjit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,3 +869,27 @@ def use(array, initial)
use([], 0)
[use([2, 2], 38), use([14, 14, 14], 0)]
}

# test calling method taking block param
assert_equal '[Proc, 1, 2, 3, Proc]', %q{
def three(a, b, c, &block)
[a, b, c, block.class]
end

def zero(&block)
block.class
end

def use_three
three(1, 2, 3) {}
end

def use_zero
zero {}
end

use_three
use_zero

[use_zero] + use_three
}
21 changes: 19 additions & 2 deletions yjit_codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1891,7 +1891,22 @@ gen_return_branch(codeblock_t* cb, uint8_t* target0, uint8_t* target1, uint8_t s
}
}

bool rb_simple_iseq_p(const rb_iseq_t *iseq);
// Returns whether the iseq only needs positional (lead) argument setup.
static bool
iseq_lead_only_arg_setup_p(const rb_iseq_t *iseq)
{
// When iseq->body->local_iseq == iseq, setup_parameters_complex()
// doesn't do anything to setup the block parameter.
bool takes_block = iseq->body->param.flags.has_block;
return (!takes_block || iseq->body->local_iseq == iseq) &&
maximecb marked this conversation as resolved.
Show resolved Hide resolved
iseq->body->param.flags.has_opt == false &&
iseq->body->param.flags.has_rest == false &&
iseq->body->param.flags.has_post == false &&
iseq->body->param.flags.has_kw == false &&
iseq->body->param.flags.has_kwrest == false &&
iseq->body->param.flags.accepts_no_kwarg == false;
Copy link
Contributor

@maximecb maximecb May 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

accepts_no_kwarg == false means the method accepts kwargs?

Copy link
Contributor Author

@XrXr XrXr May 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea. For example, calling methods that only take position arguments with keywords is allowed:

def foo(a)
  p(a)
end

foo(key: 'word') # => {:key=>"word"}

We reject call kwarg call sites at the moment, though, just in case you are wondering how we deal with the kwargs to hash conversion.

The accepts_no_kwarg flag is for the **nil syntax:

def a(arg, **nil)
  p(arg)
end

a(key: 'word') # no keywords accepted (ArgumentError)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I will merge this but I think this is the sort of thing that could be better commented, because it's really not obvious for people not intimately familiar with specific parts of CRuby.

}

bool rb_iseq_only_optparam_p(const rb_iseq_t *iseq);
bool rb_iseq_only_kwparam_p(const rb_iseq_t *iseq);

Expand All @@ -1909,7 +1924,9 @@ gen_send_iseq(jitstate_t *jit, ctx_t *ctx, const struct rb_callinfo *ci, const r
// Arity handling and optional parameter setup
int num_params = iseq->body->param.size;
uint32_t start_pc_offset = 0;
if (rb_simple_iseq_p(iseq)) {
if (iseq_lead_only_arg_setup_p(iseq)) {
num_params = iseq->body->param.lead_num;

if (num_params != argc) {
GEN_COUNTER_INC(cb, send_iseq_arity_error);
return YJIT_CANT_COMPILE;
Expand Down