[Truffle] Fix a few issues detected by FindBugs.

jruby · Sep 29, 2016 · 8b406d5 · 8b406d5
1 parent 427fc50
commit 8b406d5
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 46 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatFloatNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatFloatNode.java
@@ -131,7 +131,7 @@ public byte[] formatInfinite(int width, int precision, double dval) {
             return buf.bytes();
         }
 
-        final Locale locale = Locale.getDefault(); // TODO BJF Aug 13, 2016 Correct locale here?
+        final Locale locale = Locale.ENGLISH;
         NumberFormat nf = Sprintf.getNumberFormat(locale);
         nf.setMaximumFractionDigits(Integer.MAX_VALUE);
         String str = nf.format(dval);
@@ -161,10 +161,8 @@ public byte[] formatInfinite(int width, int precision, double dval) {
                 case '7':
                 case '8':
                 case '9':
-                    if (nTrailingZeroes > 0) {
-                        for (; nTrailingZeroes > 0; nTrailingZeroes--) {
-                            digits[nDigits++] = '0';
-                        }
+                    for (; nTrailingZeroes > 0; nTrailingZeroes--) {
+                        digits[nDigits++] = '0';
                     }
                     digits[nDigits++] = ival;
                     break; // switch
@@ -192,10 +190,8 @@ public byte[] formatInfinite(int width, int precision, double dval) {
                 case '7':
                 case '8':
                 case '9':
-                    if (nTrailingZeroes > 0) {
-                        for (; nTrailingZeroes > 0; nTrailingZeroes--) {
-                            digits[nDigits++] = '0';
-                        }
+                    for (; nTrailingZeroes > 0; nTrailingZeroes--) {
+                        digits[nDigits++] = '0';
                     }
                     digits[nDigits++] = ival;
                     break; // switch

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfSimpleTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfSimpleTreeBuilder.java
@@ -41,7 +41,7 @@ public class PrintfSimpleTreeBuilder {
     private final List<FormatNode> sequence = new ArrayList<>();
     private final List<SprintfConfig> configs;
 
-    public static int DEFAULT = -1;
+    public static final int DEFAULT = -1;
 
     private static final byte[] EMPTY_BYTES = new byte[]{};
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java
@@ -131,35 +131,18 @@ public static String decodeRope(Rope value) {
 
         value = flatten(value);
 
-        if (value instanceof LeafRope) {
-            int begin = 0;
-            int length = value.byteLength();
+        int begin = 0;
+        int length = value.byteLength();
 
-            Encoding encoding = value.getEncoding();
+        Encoding encoding = value.getEncoding();
 
-            if (encoding == UTF8Encoding.INSTANCE) {
-                return RubyEncoding.decodeUTF8(value.getBytes(), begin, length);
-            }
-
-            Charset charset = encodingToCharsetMap.get(encoding);
-
-            if (charset == null) {
-                charset = EncodingManager.charsetForEncoding(encoding);
-                encodingToCharsetMap.put(encoding, charset);
-            }
+        if (encoding == UTF8Encoding.INSTANCE) {
+            return RubyEncoding.decodeUTF8(value.getBytes(), begin, length);
+        }
 
-            if (charset == null) {
-                try {
-                    return new String(value.getBytes(), begin, length, encoding.toString());
-                } catch (UnsupportedEncodingException uee) {
-                    return value.toString();
-                }
-            }
+        Charset charset = encodingToCharsetMap.computeIfAbsent(encoding, EncodingManager::charsetForEncoding);
 
-            return RubyEncoding.decode(value.getBytes(), begin, length, charset);
-        } else {
-            throw new RuntimeException("Decoding to String is not supported for rope of type: " + value.getClass().getName());
-        }
+        return RubyEncoding.decode(value.getBytes(), begin, length, charset);
     }
 
     // MRI: get_actual_encoding

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -1949,7 +1949,7 @@ private Object performSqueezeBang(DynamicObject string, DynamicObject[] otherStr
 
             if (checkEncodingNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                checkEncodingNode = insert(checkEncodingNode = EncodingNodesFactory.CheckEncodingNodeGen.create(getContext(), null, null, null));
+                checkEncodingNode = insert(EncodingNodesFactory.CheckEncodingNodeGen.create(getContext(), null, null, null));
             }
 
             final Rope rope = rope(string);
@@ -4394,7 +4394,7 @@ private DynamicObject makeBuffer(DynamicObject string, int beg, int len) {
             return ret;
         }
 
-        private final class SearchResult {
+        private static final class SearchResult {
             public final int index;
             public final Rope rope;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropManager.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropManager.java
@@ -34,7 +34,7 @@ public Object findExportedObject(String name) {
     }
 
     public Object importObject(String name) {
-        return context.getEnv().importSymbol(name.toString());
+        return context.getEnv().importSymbol(name);
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadBlockNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadBlockNode.java
@@ -21,7 +21,6 @@ public class ReadBlockNode extends RubyNode {
     private final Object valueIfAbsent;
 
     private final ConditionProfile nullProfile = ConditionProfile.createBinaryProfile();
-    private final ConditionProfile unusualShapeProfile = ConditionProfile.createBinaryProfile();
 
     public ReadBlockNode(Object valueIfAbsent) {
         this.valueIfAbsent = valueIfAbsent;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/UncachedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/UncachedDispatchNode.java
@@ -24,8 +24,6 @@
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.methods.DeclarationContext;
 import org.jruby.truffle.language.methods.InternalMethod;
-import org.jruby.truffle.language.objects.MetaClassNode;
-import org.jruby.truffle.language.objects.MetaClassNodeGen;
 
 public class UncachedDispatchNode extends DispatchNode {
 
@@ -35,7 +33,6 @@ public class UncachedDispatchNode extends DispatchNode {
     @Child private IndirectCallNode indirectCallNode;
     @Child private ToSymbolNode toSymbolNode;
     @Child private NameToJavaStringNode toJavaStringNode;
-    @Child private MetaClassNode metaClassNode;
 
     private final BranchProfile methodMissingProfile = BranchProfile.create();
     private final BranchProfile methodMissingNotFoundProfile = BranchProfile.create();
@@ -48,7 +45,6 @@ public UncachedDispatchNode(RubyContext context, boolean ignoreVisibility, Dispa
         this.indirectCallNode = Truffle.getRuntime().createIndirectCallNode();
         this.toSymbolNode = ToSymbolNodeGen.create(context, null, null);
         this.toJavaStringNode = NameToJavaStringNode.create();
-        this.metaClassNode = MetaClassNodeGen.create(context, null, null);
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/parser/LoadArgumentsTranslator.java b/truffle/src/main/java/org/jruby/truffle/parser/LoadArgumentsTranslator.java
@@ -497,7 +497,7 @@ public RubyNode visitMultipleAsgnNode(MultipleAsgnParseNode node) {
 
         final List<ParseNode> childNodes;
 
-        if (node.childNodes() == null || node.childNodes().get(0) == null) {
+        if (node.childNodes().get(0) == null) {
             childNodes = Collections.emptyList();
         } else {
             childNodes = node.childNodes().get(0).childNodes();

diff --git a/truffle/src/main/java/org/jruby/truffle/parser/MethodTranslator.java b/truffle/src/main/java/org/jruby/truffle/parser/MethodTranslator.java
@@ -299,7 +299,7 @@ private void declareArguments() {
     public static Arity getArity(ArgsParseNode argsNode) {
         final String[] keywordArguments;
 
-        if (argsNode.hasKwargs() && argsNode.getKeywords() != null) {
+        if (argsNode.hasKwargs() && argsNode.getKeywordCount() > 0) {
             final ParseNode[] keywordNodes = argsNode.getKeywords().children();
             final int keywordsCount = keywordNodes.length;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/util/StringUtils.java b/truffle/src/main/java/org/jruby/truffle/util/StringUtils.java
@@ -42,7 +42,7 @@ public static String replace(String string, CharSequence target, CharSequence re
 
     @TruffleBoundary
     public static String toLowerCase(String string) {
-        return string.toLowerCase();
+        return string.toLowerCase(Locale.ENGLISH);
     }
 
 }