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: bcd2bab9fdfc
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ff19740fc3f5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 6, 2017

  1. Copy the full SHA
    5228f8c View commit details

Commits on Jan 11, 2017

  1. Merge pull request #4423 from headius/lambda-break

    Kill the LocalJumpError logic for break in lambda. Fixes #4369.
    enebo authored Jan 11, 2017
    Copy the full SHA
    ff19740 View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
Original file line number Diff line number Diff line change
@@ -202,10 +202,6 @@ public static IRubyObject handleBreakAndReturnsInLambdas(ThreadContext context,
// that ensures are run, frames/scopes are popped
// from runtime stacks, etc.
return ((IRWrappedLambdaReturnValue)exc).returnValue;
} else if ((exc instanceof IRBreakJump) && inNonMethodBodyLambda(scope, blockType)) {
// We just unwound all the way up because of a non-local break
context.setSavedExceptionInLambda(IRException.BREAK_LocalJumpError.getException(context.runtime));
return null;
} else if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
try {
// Ignore non-local return processing in non-lambda blocks.