Merge branch 'master' into truffle-head

jruby · Nov 23, 2015 · 5947ae1 · 5947ae1
2 parents c4e3ab5 + b3938a7
commit 5947ae1
Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/spec/truffle/tags/core/encoding/default_external_tags.txt b/spec/truffle/tags/core/encoding/default_external_tags.txt
@@ -3,3 +3,4 @@ windows:Encoding.default_external with command line options returns the encoding
 slow:Encoding.default_external with command line options is not changed by the -U option
 slow:Encoding.default_external with command line options returns the encoding specified by '-E external'
 slow:Encoding.default_external with command line options returns the encoding specified by '-E external:'
+fails:Encoding.default_external with command line options is not changed by the -U option
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/AtomicReferenceNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/AtomicReferenceNodes.java
@@ -77,8 +77,8 @@ public CompareAndSetNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization
-        public boolean compareAndSet(DynamicObject self, Object expected_value, Object value) {
-            return Layouts.ATOMIC_REFERENCE.compareAndSetValue(self, expected_value, value);
+        public boolean compareAndSet(DynamicObject self, Object expectedValue, Object value) {
+            return Layouts.ATOMIC_REFERENCE.compareAndSetValue(self, expectedValue, value);
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/rubinius/AtomicReferenceLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/rubinius/AtomicReferenceLayout.java
@@ -26,7 +26,7 @@ DynamicObject createAtomicReference(DynamicObjectFactory factory,
 
     Object getValue(DynamicObject object);
     void setValue(DynamicObject object, Object value);
-    boolean compareAndSetValue(DynamicObject object, Object expected_value, Object value);
+    boolean compareAndSetValue(DynamicObject object, Object expectedValue, Object value);
     Object getAndSetValue(DynamicObject object, Object value);
 
 }