Skip to content

Remove unsafe-mock from our build altogether.#4381

Merged
headius merged 1 commit intojruby:masterfrom
headius:no-unsafe-mock
Dec 14, 2016
Merged

Remove unsafe-mock from our build altogether.#4381
headius merged 1 commit intojruby:masterfrom
headius:no-unsafe-mock

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
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.

2 participants