jruby · May 10, 2015 · May 10, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java
@@ -31,7 +31,6 @@ public abstract class IntegerNodes {
     @CoreMethod(names = "downto", needsBlock = true, required = 1, returnsEnumeratorIfNoBlock = true, unsupportedOperationBehavior = UnsupportedOperationBehavior.ARGUMENT_ERROR)
     public abstract static class DownToNode extends YieldingCoreMethodNode {
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 
@@ -128,7 +127,6 @@ public abstract static class TimesNode extends YieldingCoreMethodNode {
 
         @Child private FixnumOrBignumNode fixnumOrBignum;
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 
@@ -262,7 +260,6 @@ public RubyBignum toI(RubyBignum n) {
     @CoreMethod(names = "upto", needsBlock = true, required = 1, returnsEnumeratorIfNoBlock = true, unsupportedOperationBehavior = UnsupportedOperationBehavior.ARGUMENT_ERROR)
     public abstract static class UpToNode extends YieldingCoreMethodNode {
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
@@ -70,7 +70,6 @@ public RubyArray collect(VirtualFrame frame, RubyRange.IntegerFixnumRange range,
     @CoreMethod(names = "each", needsBlock = true, lowerFixnumSelf = true, returnsEnumeratorIfNoBlock = true)
     public abstract static class EachNode extends YieldingCoreMethodNode {
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 
@@ -248,7 +247,6 @@ public Object last(RubyRange.ObjectRange range) {
     @CoreMethod(names = "step", needsBlock = true, optional = 1, returnsEnumeratorIfNoBlock = true)
     public abstract static class StepNode extends YieldingCoreMethodNode {
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
@@ -1243,7 +1243,6 @@ public abstract static class EachNode extends YieldingCoreMethodNode {
 
         @Child private CallDispatchHeadNode toEnumNode;
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 
@@ -1411,7 +1410,6 @@ public Object eachObject(VirtualFrame frame, RubyArray array, RubyProc block) {
     @ImportStatic(ArrayGuards.class)
     public abstract static class EachWithIndexNode extends YieldingCoreMethodNode {
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 
@@ -2158,7 +2156,6 @@ public abstract static class MapNode extends YieldingCoreMethodNode {
 
         @Child private ArrayBuilderNode arrayBuilder;
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 
@@ -2319,7 +2316,6 @@ public abstract static class MapInPlaceNode extends YieldingCoreMethodNode {
 
         @Child private ArrayWriteDenormalizedNode writeNode;
 
-        private final BranchProfile breakProfile = BranchProfile.create();
         private final BranchProfile nextProfile = BranchProfile.create();
         private final BranchProfile redoProfile = BranchProfile.create();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/fixnum/FixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/fixnum/FixnumNodes.java
@@ -1351,7 +1351,7 @@ public Object abs(long n) {
     @CoreMethod(names = "bit_length")
     public abstract static class BitLengthNode extends CoreMethodArrayArgumentsNode {
 
-        private static final int INTEGER_BITS = Integer.numberOfLeadingZeros(0);
+        private static final int INT_BITS = Integer.numberOfLeadingZeros(0);
         private static final int LONG_BITS = Long.numberOfLeadingZeros(0);
 
         public BitLengthNode(RubyContext context, SourceSection sourceSection) {
@@ -1360,7 +1360,11 @@ public BitLengthNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public int bitLength(int n) {
-            return bitLength((long) n);
+            if (n < 0) {
+                n = ~n;
+            }
+
+            return INT_BITS - Integer.numberOfLeadingZeros(n);
         }
 
         @Specialization
@@ -1369,10 +1373,6 @@ public int bitLength(long n) {
                 n = ~n;
             }
 
-            if (n == Long.MAX_VALUE) {
-                return LONG_BITS - 1;
-            }
-
             return LONG_BITS - Long.numberOfLeadingZeros(n);
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/debug/AssertConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/debug/AssertConstantNode.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
@@ -25,6 +26,7 @@ public AssertConstantNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }
 
+    @SuppressWarnings("unused")
     private static volatile boolean[] sideEffect;
 
     @Specialization

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/debug/AssertNotCompiledNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/debug/AssertNotCompiledNode.java
@@ -12,6 +12,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
@@ -23,6 +24,7 @@ public AssertNotCompiledNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }
 
+    @SuppressWarnings("unused")
     private static volatile boolean[] sideEffect;
 
     @Specialization

diff --git a/truffle/src/main/java/org/jruby/truffle/pack/nodes/write/WriteHexStringNode.java b/truffle/src/main/java/org/jruby/truffle/pack/nodes/write/WriteHexStringNode.java
@@ -43,7 +43,6 @@ public Object write(VirtualFrame frame, ByteList bytes) {
         int begin = bytes.begin();
 
         int currentByte = 0;
-        int padLength = 0;
 
         final int lengthToUse;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
@@ -132,13 +132,11 @@ public RubyNode visitArgsNode(org.jruby.ast.ArgsNode node) {
         if (hasKeywordArguments) {
             kwIndex = 0;
             countKwArgs = 0;
-            for (org.jruby.ast.Node arg : node.getKeywords().childNodes()) {
-                countKwArgs++;
-            }
 
             for (org.jruby.ast.Node arg : node.getKeywords().childNodes()) {
                 sequence.add(arg.accept(this));
                 kwIndex++;
+                countKwArgs++;
             }
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/ReadLocalDummyNode.java b/truffle/src/main/java/org/jruby/truffle/translator/ReadLocalDummyNode.java
@@ -37,7 +37,7 @@ public <T> T accept(NodeVisitor<T> visitor) {
 
     @Override
     public List<Node> childNodes() {
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 
     @Override