[GR-13337] Ensure spotbugs compliance.

PullRequest: truffleruby/604

Author: dougxc

doc/contributor/static-analysis.md

@@ -36,14 +36,14 @@ Passing CheckStyle is enforced in our CI gate.
 $ mx checkstyle
 ```
 
-### FindBugs
+### SpotBugs
 
-[FindBugs](http://findbugs.sourceforge.net) looks for potential Java
-programming errors. We run it with the default Graal project configuration.
-Passing FindBugs is enforced in our CI gate.
+[SpotBugs](https://spotbugs.github.io) looks for potential Java programming
+errors. We run it with the default Graal project configuration. Passing
+SpotBugs is enforced in our CI gate.
 
 ```
-$ mx findbugs
+$ mx spotbugs
 ```
 
 ## Ruby

mx.truffleruby/suite.py

@@ -1,5 +1,5 @@
 suite = {
-    "mxversion": "5.156.0",
+    "mxversion": "5.210.3",
     "name": "truffleruby",
 
     "imports": {
@@ -9,7 +9,7 @@
                 "name": "tools",
                 "subdir": True,
                 # version must always be equal to the version of the "sulong" import below
-                "version": "892e0854c0b1af7e29540eadb862f221d113aaf0",
+                "version": "9be7ab457c51adf6d985ca578c60c450925be0ac",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -19,7 +19,7 @@
                 "name": "sulong",
                 "subdir": True,
                 # version must always be equal to the version of the "tools" import above
-                "version": "892e0854c0b1af7e29540eadb862f221d113aaf0",
+                "version": "9be7ab457c51adf6d985ca578c60c450925be0ac",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/RubyContext.java

@@ -82,8 +82,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.concurrent.locks.ReentrantLock;
@@ -756,8 +754,9 @@ private String searchRubyHome(Options options) throws IOException {
         // Use the path relative to the launcher
 
         if (!options.LAUNCHER.isEmpty()) {
-            final Path canonicalLauncherPath = Paths.get(new File(options.LAUNCHER).getCanonicalPath());
-            final File candidate = canonicalLauncherPath.getParent().getParent().toFile();
+            final File canonicalLauncherPath = new File(options.LAUNCHER).getCanonicalFile();
+            final File launcherDir = canonicalLauncherPath.getParentFile();
+            final File candidate = launcherDir == null ? null : launcherDir.getParentFile();
             RubyLanguage.LOGGER.config(() -> String.format("trying home %s guessed from executable %s, as the Ruby home", candidate, options.LAUNCHER));
             if (isRubyHome(candidate)) {
                 return candidate.getCanonicalPath();
@@ -777,9 +776,8 @@ private String searchRubyHome(Options options) throws IOException {
     }
 
     private boolean isRubyHome(File path) {
-        return Paths.get(path.toString(), "lib", "truffle").toFile().isDirectory() &&
-                Paths.get(path.toString(), "lib", "ruby").toFile().isDirectory() &&
-                Paths.get(path.toString(), "lib", "patches").toFile().isDirectory();
+        final File lib = new File(path, "lib");
+        return new File(lib, "truffle").isDirectory() && new File(lib, "ruby").isDirectory() && new File(lib, "patches").isDirectory();
     }
 
     public TruffleNFIPlatform getTruffleNFI() {

src/main/java/org/truffleruby/builtins/AmbiguousOptionalArgumentChecker.java

@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.SuppressFBWarnings;
 import org.truffleruby.language.RubyNode;
 
 import java.lang.reflect.Method;
@@ -38,6 +39,7 @@ public static void verifyNoAmbiguousOptionalArguments(NodeFactory<? extends Ruby
         }
     }
 
+    @SuppressFBWarnings("Dm")
     private static void verifyNoAmbiguousOptionalArgumentsWithReflection(NodeFactory<? extends RubyNode> nodeFactory, CoreMethod methodAnnotation) {
         if (methodAnnotation.optional() > 0 || methodAnnotation.needsBlock()) {
             final int opt = methodAnnotation.optional();
@@ -121,8 +123,14 @@ private static boolean isParameterUnguarded(Method method, Parameter[] parameter
 
     private static List<Method> specializations(Class<?> node) {
         Method[] methods = node.getDeclaredMethods();
-        return Arrays.stream(methods).filter(m -> m.isAnnotationPresent(Specialization.class)).collect(Collectors.toList());
+        return Arrays.stream(methods).filter(m -> isSpecialization(m)).collect(Collectors.toList());
     }
+
+    @SuppressFBWarnings("Dm")
+    private static boolean isSpecialization(Method m) {
+        return m.isAnnotationPresent(Specialization.class);
+    }
+
     private static boolean isGuarded(String name, String[] guards) {
         for (String guard : guards) {
             if (guard.equals("wasProvided(" + name + ")") ||

src/main/java/org/truffleruby/builtins/LowerFixnumChecker.java

@@ -14,6 +14,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.SuppressFBWarnings;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.language.RubyNode;
 
@@ -24,6 +25,7 @@ public class LowerFixnumChecker {
 
     public static boolean SUCCESS = true;
 
+    @SuppressFBWarnings("Dm")
     public static void checkLowerFixnumArguments(NodeFactory<? extends RubyNode> nodeFactory, int initialSkip, int[] lowerFixnum) {
         final Class<? extends RubyNode> nodeClass = nodeFactory.getNodeClass();
         byte[] lowerArgs = null;

src/main/java/org/truffleruby/gem/bcrypt/BCrypt.java

@@ -423,7 +423,7 @@ private static String encode_base64(byte d[], int len)
      * @return the decoded value of x
      */
     private static byte char64(char x) {
-        if (x < 0 || x > index_64.length) {
+        if (x >= index_64.length) {
             return -1;
         }
         return index_64[x];

src/main/java/org/truffleruby/language/loader/FileLoader.java

@@ -38,11 +38,6 @@ public FileLoader(RubyContext context) {
     }
 
     public void ensureReadable(String path) {
-        if (context == null) {
-            // Ignore during pre-initialisation
-            return;
-        }
-
         final File file = new File(path);
 
         if (!file.exists()) {
@@ -63,7 +58,7 @@ public RubySource loadFile(String path) throws IOException {
 
         final String name;
 
-        if (context != null && context.isPreInitializing()) {
+        if (context.isPreInitializing()) {
             name = RubyLanguage.RUBY_HOME_SCHEME + Paths.get(context.getRubyHome()).relativize(Paths.get(path));
         } else {
             name = path;