Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unsafe-mock from our build altogether. #4381

Merged
merged 1 commit into from Dec 14, 2016

Conversation

headius
Copy link
Member

@headius headius commented Dec 13, 2016

This commit replaces the unsafe-mock dependency -- which caused
various build problems living in boot classpath -- with a new
library that just shims the three Unsafe methods added in Java 8:
fullFence, loadFence, and storeFence. This allows us to eliminate
all calls to those methods from JRuby proper as well as the build
tricks.

Fixes #4103.

@headius
Copy link
Member Author

headius commented Dec 14, 2016

@enebo Any objections? It does not add a dependency, but it is a new library (of one class) and it does get shaded in. I think it's worth it to eliminate the tweaky bootclasspath flags we've been passing.

This commit replaces the unsafe-mock dependency -- which caused
various build problems living in boot classpath -- with a new
library that just shims the three Unsafe methods added in Java 8:
fullFence, loadFence, and storeFence. This allows us to eliminate
all calls to those methods from JRuby proper as well as the build
tricks.

Fixes jruby#4103.
Copy link
Member

@enebo enebo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me...now I can also use debug in intellij without commenting out 3 lines!!!

@headius headius merged commit d501037 into jruby:master Dec 14, 2016
@headius headius deleted the no-unsafe-mock branch December 14, 2016 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants