Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8cd8c1c80289
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30e99a0c58c8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 19, 2015

  1. Revert "Turn off block call protocol till we get failures fixed" 

    This reverts commit ccc8e03.
    @subbuss
    subbuss committed Dec 19, 2015
    Copy the full SHA
    f5aa6de View commit details

  2. Fix bug with prepareBlockArgs which fixes 2 test:mri:jit failures

    @subbuss
    subbuss committed Dec 19, 2015
    Copy the full SHA
    30e99a0 View commit details
3 changes: 1 addition & 2 deletions core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java
View file
Original file line number Diff line number Diff line change
@@ -23,8 +23,7 @@ public String getLabel() {

private boolean explicitCallProtocolSupported(IRScope scope) {
return scope instanceof IRMethod
// Turn off till we get everything greened again
// || (scope instanceof IRClosure && !(scope instanceof IREvalScript))
|| (scope instanceof IRClosure && !(scope instanceof IREvalScript))
|| (scope instanceof IRModuleBody && !(scope instanceof IRMetaClassBody));
}

6 changes: 1 addition & 5 deletions core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
View file
Original file line number Diff line number Diff line change
@@ -1535,11 +1535,7 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo

BlockBody body = block.getBody();
org.jruby.runtime.Signature sig = body.getSignature();

// blockArity == 0 and 1 have been handled in the specialized instructions
// This test is when we only have opt / rest arg (either keyword or non-keyword)
// but zero required args.
if (sig.arityValue() == -1) {
if (sig.arityValue() == -1 || sig.required() == 1) {
if (isLambda) block.getBody().getSignature().checkArity(context.runtime, args);
return args;
}