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 headius added this to the JRuby 9.1.7.0 milestone Dec 13, 2016
@headius headius force-pushed the headius:no-unsafe-mock branch from 81f43ef to c6a95fb Dec 13, 2016
@headius
Copy link
Member Author

@headius 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 #4103.
@headius headius force-pushed the headius:no-unsafe-mock branch from c6a95fb to 64b9553 Dec 14, 2016
@enebo
enebo approved these changes Dec 14, 2016
Copy link
Member

@enebo enebo left a comment

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
1 check was pending
1 check was pending
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@headius headius deleted the headius:no-unsafe-mock branch Dec 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.