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

Commits on Aug 12, 2016

  1. assert there's a non null binding in Block (use DUMMY one)

    would have been another potential fix for #4037
    kares committed Aug 12, 2016
    Copy the full SHA
    1e4744b View commit details
  2. Copy the full SHA
    cbce8be View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −2 core/src/main/java/org/jruby/runtime/Block.java
  2. +0 −2 core/src/main/java/org/jruby/runtime/BlockBody.java
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/runtime/Block.java
Original file line number Diff line number Diff line change
@@ -86,13 +86,13 @@ public enum Type {
public static final Block NULL_BLOCK = new Block(BlockBody.NULL_BODY);

public Block(BlockBody body, Binding binding) {
assert binding != null;
this.body = body;
this.binding = binding;
}

public Block(BlockBody body) {
this.body = body;
this.binding = null;
this(body, Binding.DUMMY);
}

public DynamicScope allocScope(DynamicScope parentScope) {
2 changes: 0 additions & 2 deletions core/src/main/java/org/jruby/runtime/BlockBody.java
Original file line number Diff line number Diff line change
@@ -49,8 +49,6 @@
*/
public abstract class BlockBody {

public static final String[] EMPTY_PARAMETER_LIST = org.jruby.util.StringSupport.EMPTY_STRING_ARRAY;

protected final Signature signature;
protected volatile MethodHandle testBlockBody;