Always use fences since we depend on Java 8 and higher now.

jruby · Oct 19, 2017 · 0fd3be0 · 0fd3be0
1 parent 4e62ac5
commit 0fd3be0
Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -59,7 +59,6 @@
 
   jar 'com.headius:invokebinder:1.9'
   jar 'com.headius:options:1.4'
-  jar 'com.headius:unsafe-fences:1.0'
 
   jar 'bsf:bsf:2.4.0', :scope => 'provided'
   jar 'com.jcraft:jzlib:1.1.3'

diff --git a/core/pom.xml b/core/pom.xml
@@ -200,11 +200,6 @@ DO NOT MODIFIY - GENERATED CODE
       <artifactId>options</artifactId>
       <version>1.4</version>
     </dependency>
-    <dependency>
-      <groupId>com.headius</groupId>
-      <artifactId>unsafe-fences</artifactId>
-      <version>1.0</version>
-    </dependency>
     <dependency>
       <groupId>bsf</groupId>
       <artifactId>bsf</artifactId>

diff --git a/core/src/main/java/org/jruby/runtime/ivars/StampedVariableAccessor.java b/core/src/main/java/org/jruby/runtime/ivars/StampedVariableAccessor.java
@@ -26,7 +26,6 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.runtime.ivars;
 
-import com.headius.unsafe.fences.UnsafeFences;
 import org.jruby.RubyBasicObject;
 import org.jruby.RubyClass;
 import org.jruby.util.ArraySupport;
@@ -152,13 +151,8 @@ private static boolean createTableUnsafe(RubyBasicObject self, int currentStamp,
      */
     private static boolean updateTableUnsafe(RubyBasicObject self, int currentStamp, Object[] currentTable, int index, Object value) {
         // shared access to varTable field.
-        if(UnsafeFences.SUPPORTS_FENCES) {
-            currentTable[index] = value;
-            UnsafeFences.fullFence();
-        } else {
-            // TODO: maybe optimize by read and checking current value before setting
-            UnsafeHolder.U.putObjectVolatile(currentTable, UnsafeHolder.ARRAY_OBJECT_BASE_OFFSET + UnsafeHolder.ARRAY_OBJECT_INDEX_SCALE * index, value);
-        }
+        currentTable[index] = value;
+        UnsafeHolder.U.fullFence();
 
         // validate stamp. redo on concurrent modification
         return self.varTableStamp == currentStamp;

diff --git a/core/src/main/java/org/jruby/util/unsafe/UnsafeHolder.java b/core/src/main/java/org/jruby/util/unsafe/UnsafeHolder.java
@@ -26,8 +26,6 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.util.unsafe;
 
-import com.headius.unsafe.fences.UnsafeFences;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
@@ -90,7 +88,4 @@ public static long fieldOffset(Class clazz, String name) {
             return sun.misc.Unsafe.INVALID_FIELD_OFFSET;
         }
     }
-
-    @Deprecated
-    public static final boolean SUPPORTS_FENCES = UnsafeFences.SUPPORTS_FENCES;
 }