Disable the AddLocalVarLoadStore pass to fix #3891.#3898
Merged
headius merged 4 commits intojruby:masterfrom May 26, 2016
Merged
Disable the AddLocalVarLoadStore pass to fix #3891.#3898headius merged 4 commits intojruby:masterfrom
headius merged 4 commits intojruby:masterfrom
Conversation
This was a good experiment, but we're not properly ensuring the heap variables are being loaded live when needed, causing examples like that in jruby#3891 to fail to propagate changes across threads. By implementing LocalVariable load/store logic in JIT and turning off the "Add" pass, we basically revert heap vars to always being read/written immediately, as in JRuby 1.7.25. It may be possible to improve the pass so that it localizes the loads and stores better and ensures we don't miss updates we should see, but this commit will test whether the "nuclear option" passes all our suites.
Many places just used jvmStoreLocal to store the variable, which assumed (because we only ran with call protocol in place) that all such stores would be to Java locals. I refactored this method to support LocalVariable as well as a different form that avoids stack-juggling to insert the value into the scope. This appears to get almost all code compiling that compiled before.
We can't store Block in heap scope, so we need this pass to come later.
headius
force-pushed
the
disable_add_loadstore
branch
from
5a61550 to
6f37585
Compare
Member
Author
|
This is now working well, and the fixes here should probably not be squashed because there's other bits and pieces with important history. I did discover #3906 and related minor issues in the process of getting this passing tests. With #3906 outstanding, there's a chance this PR might cause OptimizeDelegation to never work in the presence of keyword arguments, since we do not keep everything in JVM locals anymore. |
Member
Author
Contributor
|
I think it is okay to merge this and also fix the bug .. and then independently figure out whether to enable the pass or not. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This was a good experiment, but we're not properly ensuring the
heap variables are being loaded live when needed, causing examples
like that in #3891 to fail to propagate changes across threads.
By implementing LocalVariable load/store logic in JIT and turning
off the "Add" pass, we basically revert heap vars to always being
read/written immediately, as in JRuby 1.7.25.
It may be possible to improve the pass so that it localizes the
loads and stores better and ensures we don't miss updates we
should see, but this commit will test whether the "nuclear option"
passes all our suites.
cc @subbuss @enebo