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
base: 66b29052ff77
Choose a base ref
...
head repository: jruby/jruby
compare: 15f651b6361d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 2, 2014

  1. Revert "Fully clone block + frame for instance_eval forms." 

    This reverts commit 17c67a6.
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    cdba7c8 View commit details
    Browse the repository at this point in the history

  2. Less broken but more grosser fix for #1290 and #1547. 

    MRI manages the frame's self differently, just saving it into the
binding and then putting it in the sole global state field that
represents the current thread's active frame. In our case, we use
the entire Frame object as a carrier for frame data, so we need
to keep the object the same for mutable frame fields like backref
to propagate. As a result, the only fix possible for this on 1.7
is to change the self back after instance_eval.

We may be able to fix this better on master, where the runtime
has been restructured and may support a more correct notion of the
current frame's self.
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    15f651b View commit details
    Browse the repository at this point in the history