Fix ordeting on Java 7 in volatile variable write

pitr-ch · pitr-ch · commit ca1ae66784d3 · 2015-06-28T16:20:44.000+02:00
diff --git a/ext/com/concurrent_ruby/ext/SynchronizationLibrary.java b/ext/com/concurrent_ruby/ext/SynchronizationLibrary.java
@@ -144,8 +144,8 @@ public IRubyObject InstanceVariableSetVolatile(ThreadContext context, IRubyObjec
                 UnsafeHolder.storeFence();
                 return result;
             } else {
+                final IRubyObject result = instance_variable_set(name, value);
                 UnsafeHolder.U.putIntVolatile(this, AN_VOLATILE_FIELD_OFFSET, 1);
-                IRubyObject result = instance_variable_set(name, value);
                 return result;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ public IRubyObject InstanceVariableSetVolatile(ThreadContext context, IRubyObjec`
`144`	`144`	`UnsafeHolder.storeFence();`
`145`	`145`	`return result;`
`146`	`146`	`} else {`
	`147`	`+ final IRubyObject result = instance_variable_set(name, value);`
`147`	`148`	`UnsafeHolder.U.putIntVolatile(this, AN_VOLATILE_FIELD_OFFSET, 1);`
`148`		`- IRubyObject result = instance_variable_set(name, value);`
`149`	`149`	`return result;`
`150`	`150`	`}`
`151`	`151`	`}`