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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0cfc73fac2da
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47e3adcc6011
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 1, 2015

  1. Re-enblig memory fences 

    It was breaking `StampedVariableAccessor`, resulting in
not sinchronized access to instance variables
when `StampedVariableAccessor` was used.
    @pitr-ch
    pitr-ch committed Feb 1, 2015
    Copy the full SHA
    10fc903 View commit details

  2. Merge pull request #2546 from pitr-ch/reenable-fences 

    Re-enblig memory fences
    @headius
    headius committed Feb 1, 2015
    Copy the full SHA
    47e3adc View commit details
Showing with 3 additions and 6 deletions.
  1. +3 −6 core/src/main/java/org/jruby/util/unsafe/UnsafeHolder.java
9 changes: 3 additions & 6 deletions core/src/main/java/org/jruby/util/unsafe/UnsafeHolder.java
View file
Original file line number Diff line number Diff line change
@@ -93,18 +93,15 @@ public static long fieldOffset(Class clazz, String name) {
//// The following methods are Java8 only. They will throw undefined method errors if invoked without checking for fence support

public static void fullFence() {
// CS: Seems to cause problems when I build with Maven
//U.fullFence();
U.fullFence();
}

public static void loadFence() {
// CS: Seems to cause problems when I build with Maven
//U.loadFence();
U.loadFence();
}

public static void storeFence() {
// CS: Seems to cause problems when I build with Maven
//U.storeFence();
U.storeFence();
}