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

Commits on May 20, 2016

  1. Copy the full SHA
    d4d6ac3 View commit details

Commits on May 26, 2016

  1. Merge pull request #3909 from headius/zsuper_sans_binding

    ZSuper does not require caller's binding/scope.
    headius committed May 26, 2016
    Copy the full SHA
    6d1062e View commit details
Showing with 1 addition and 3 deletions.
  1. +1 −2 core/src/main/java/org/jruby/ir/IRScope.java
  2. +0 −1 core/src/main/java/org/jruby/ir/instructions/ZSuperInstr.java
3 changes: 1 addition & 2 deletions core/src/main/java/org/jruby/ir/IRScope.java
Original file line number Diff line number Diff line change
@@ -666,8 +666,7 @@ private void calculateClosureScopeFlags() {
EnumSet.of(
CAN_RECEIVE_BREAKS,
HAS_NONLOCAL_RETURNS,CAN_RECEIVE_NONLOCAL_RETURNS,
BINDING_HAS_ESCAPED,
USES_ZSUPER);
BINDING_HAS_ESCAPED);

private void computeNeedsDynamicScopeFlag() {
for (IRFlags f : NEEDS_DYNAMIC_SCOPE_FLAGS) {
Original file line number Diff line number Diff line change
@@ -26,7 +26,6 @@ public ZSuperInstr(Variable result, Operand receiver, Operand[] args, Operand cl
public boolean computeScopeFlags(IRScope scope) {
super.computeScopeFlags(scope);
scope.getFlags().add(IRFlags.USES_ZSUPER);
scope.getFlags().add(IRFlags.CAN_CAPTURE_CALLERS_BINDING);
return true;
}