[GR-13337] Enable SpotBugs.

PullRequest: fastr/1915

Author: lukasstadler

ci_common/common.hocon

@@ -198,7 +198,7 @@ gateStyle : ${common} {
     ECLIPSE_EXE : "$ECLIPSE/eclipse"
   }
   run : [
-    ${gateCmd} ["Versions,JDKReleaseInfo,Pylint,Canonicalization Check,BuildJavaWithJavac,IDEConfigCheck,CodeFormatCheck,Checkstyle,Copyright check,UnitTests: ExpectedTestOutput file check"]
+    ${gateCmd} ["Versions,JDKReleaseInfo,Pylint,Canonicalization Check,BuildJavaWithJavac,SpotBugs,IDEConfigCheck,CodeFormatCheck,Checkstyle,Copyright check,UnitTests: ExpectedTestOutput file check"]
     ["mx", "clean", "--no-native"]
     ${gateCmd} ["BuildWithEcj"]
   ]

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java

@@ -35,6 +35,7 @@
 import com.oracle.truffle.r.launcher.RStartParams;
 import com.oracle.truffle.r.runtime.RSource.Internal;
 import com.oracle.truffle.r.runtime.RSuicide;
+import com.oracle.truffle.r.runtime.SuppressFBWarnings;
 import com.oracle.truffle.r.runtime.Utils;
 import com.oracle.truffle.r.runtime.context.RContext;
 
@@ -69,6 +70,7 @@ public class REmbedded {
      * initialize FastR as we cannot do that until the embedding system has had a chance to adjust
      * the {@link RStartParams}, which happens after this call returns.
      */
+    @SuppressFBWarnings(value = "LI_LAZY_INIT_UPDATE_STATIC", justification = "one-time initialization")
     private static void initializeR(String[] args, boolean initMainLoop) {
         assert context == null;
         RContext.setEmbedded();

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Context.java

@@ -37,6 +37,7 @@
 import com.oracle.truffle.r.ffi.impl.llvm.TruffleLLVM_DLL.ParsedLLVM_IR;
 import com.oracle.truffle.r.runtime.REnvVars;
 import com.oracle.truffle.r.runtime.RInternalError;
+import com.oracle.truffle.r.runtime.Utils;
 import com.oracle.truffle.r.runtime.context.RContext;
 import com.oracle.truffle.r.runtime.context.RContext.ContextState;
 import com.oracle.truffle.r.runtime.ffi.BaseRFFI;
@@ -134,10 +135,10 @@ public TruffleObject lookupNativeFunction(NativeFunction function) {
         CompilerAsserts.neverPartOfCompilation();
         if (!nativeFunctions.containsKey(function)) {
             TruffleObject[] lookupObjects = new TruffleObject[0];
-            if (function.getLibrary() == NativeFunction.baseLibrary()) {
+            if (Utils.identityEquals(function.getLibrary(), NativeFunction.baseLibrary())) {
                 TruffleObject lookupObject = (TruffleObject) ((LLVM_Handle) DLL.getRdllInfo().handle).parsedIRs[0].lookupObject;
                 lookupObjects = new TruffleObject[]{lookupObject};
-            } else if (function.getLibrary() == NativeFunction.anyLibrary()) {
+            } else if (Utils.identityEquals(function.getLibrary(), NativeFunction.anyLibrary())) {
                 DLLInfo dllInfo = DLL.findLibraryContainingSymbol(RContext.getInstance(), function.getCallName());
                 if (dllInfo == null) {
                     throw RInternalError.shouldNotReachHere("Could not find library containing symbol " + function.getCallName());

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DownCallNodeFactory.java

@@ -37,6 +37,7 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.r.runtime.RInternalError;
+import com.oracle.truffle.r.runtime.Utils;
 import com.oracle.truffle.r.runtime.data.RFunction;
 import com.oracle.truffle.r.runtime.ffi.DLL;
 import com.oracle.truffle.r.runtime.ffi.DLL.DLLInfo;
@@ -68,9 +69,9 @@ protected TruffleObject getTarget(NativeFunction fn) {
                 CompilerAsserts.neverPartOfCompilation();
                 String library = fn.getLibrary();
                 DLLInfo dllInfo = null;
-                if (library == baseLibrary()) {
+                if (Utils.identityEquals(library, baseLibrary())) {
                     dllInfo = DLL.getRdllInfo();
-                } else if (library != anyLibrary()) {
+                } else if (!Utils.identityEquals(library, anyLibrary())) {
                     dllInfo = DLL.findLibrary(library);
                 }
                 SymbolHandle result = DLL.findSymbol(fn.getCallName(), dllInfo);

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/mixed/TruffleMixed_Context.java

@@ -125,6 +125,7 @@ public void afterUpcall(boolean canRunGc, Type rffiType) {
     @Override
     public long beforeDowncall(Type rffiType) {
         Type actualRffiType = rffiType == null ? Type.LLVM : rffiType;
+        assert rffiType != null;
         switch (rffiType) {
             case LLVM:
                 return llvmContext.beforeDowncall(actualRffiType);

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_Context.java

@@ -42,6 +42,7 @@
 import com.oracle.truffle.r.ffi.impl.nfi.TruffleNFI_DLL.NFIHandle;
 import com.oracle.truffle.r.ffi.impl.upcalls.Callbacks;
 import com.oracle.truffle.r.runtime.RInternalError;
+import com.oracle.truffle.r.runtime.Utils;
 import com.oracle.truffle.r.runtime.context.FastROptions;
 import static com.oracle.truffle.r.runtime.context.FastROptions.TraceNativeCalls;
 import com.oracle.truffle.r.runtime.context.RContext;
@@ -143,9 +144,9 @@ public TruffleObject lookupNativeFunction(NativeFunction function) {
         CompilerAsserts.neverPartOfCompilation();
         if (!nativeFunctions.containsKey(function)) {
             TruffleObject dllInfo;
-            if (function.getLibrary() == NativeFunction.baseLibrary()) {
+            if (Utils.identityEquals(function.getLibrary(), NativeFunction.baseLibrary())) {
                 dllInfo = TruffleNFI_Context.getInstance().defaultLibrary;
-            } else if (function.getLibrary() == NativeFunction.anyLibrary()) {
+            } else if (Utils.identityEquals(function.getLibrary(), NativeFunction.anyLibrary())) {
                 DLLInfo lib = DLL.findLibraryContainingSymbol(RContext.getInstance(), function.getCallName());
                 if (lib == null) {
                     throw RInternalError.shouldNotReachHere("Could not find library containing symbol " + function.getCallName());

com.oracle.truffle.r.ffi.processor/src/com/oracle/truffle/r/ffi/processor/FFIProcessor.java

@@ -379,7 +379,7 @@ private void generateCallClass(ExecutableElement m) throws IOException {
         if (resultOwnerRHS != null) {
             w.append("                        ctx.protectChild(resultOwner, resultRObj);\n");
         } else {
-            if (returnKind != TypeKind.VOID) {
+            if (returnKind != TypeKind.VOID && needsReturnWrap) {
                 w.append("                        if (resultRObj0 != resultRObj) {\n");
                 w.append("                            ctx.protectChild(resultRObj0, resultRObj);\n");
                 w.append("                        }\n");

com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ public static ConsoleHandler createConsoleHandler(RCmdOptions options, Delegatin
 
     /**
      * Get the R prompt.
-     * 
+     *
      * @return the prompt
      */
     public abstract String getPrompt();
@@ -182,7 +182,12 @@ public Object getMemberKeys() {
 
         @Override
         public boolean hasMember(String key) {
-            return key.contains(key);
+            for (String k : keys) {
+                if (k.equals(key)) {
+                    return true;
+                }
+            }
+            return false;
         }
 
         @Override

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/device/remote/RemoteDevice.java

@@ -47,6 +47,7 @@
 import com.oracle.truffle.r.library.fastrGrid.device.NotSupportedImageFormatException;
 import com.oracle.truffle.r.runtime.REnvVars;
 import com.oracle.truffle.r.runtime.RInternalError;
+import com.oracle.truffle.r.runtime.SuppressFBWarnings;
 
 public final class RemoteDevice implements GridDevice {
 
@@ -125,6 +126,7 @@ public static RemoteDevice createWindowDevice(int width, int height) {
         }
     }
 
+    @SuppressFBWarnings(value = "LI_LAZY_INIT_UPDATE_STATIC", justification = "one-time initialization")
     private static Path javaCmd() {
         if (javaCmd == null) {
             String javaHome = System.getenv("JAVA_HOME");
@@ -139,6 +141,7 @@ private static Path javaCmd() {
         return javaCmd;
     }
 
+    @SuppressFBWarnings(value = "LI_LAZY_INIT_UPDATE_STATIC", justification = "one-time initialization")
     private static void checkQueueInited() {
         if (queueWorker == null) {
             Runnable queueWorkerRun = new Runnable() {
@@ -198,6 +201,7 @@ public void run() {
         }
     }
 
+    @SuppressFBWarnings(value = "LI_LAZY_INIT_STATIC", justification = "one-time initialization")
     private static boolean checkServerConnectable() {
         for (int i = SERVER_CONNECT_RETRIES - 1; i >= 0; i--) {
             if (serverProcess != null && !serverProcess.isAlive()) {
@@ -607,7 +611,7 @@ void finish(byte[] resultArg, Exception errorCauseArg) {
             assert (this.result == null) : "Result already assigned";
             byte[] resultArg2 = resultArg;
             if (resultArg2 != null) {
-                assert (params[0] | RESULT_MASK) != 0 : "Attempt to assign result to non-result request";
+                assert (params[0] & RESULT_MASK) != 0 : "Attempt to assign result to non-result request";
             } else {
                 resultArg2 = EMPTY_RESULT;
             }

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/methods/MethodsListDispatch.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995-2012, The R Core Team
  * Copyright (c) 2003, The R Foundation
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -188,7 +188,7 @@ protected Object callGetClassFromCache(RAbstractStringVector klass, REnvironment
                     Object valAttrObj = attributableValue.getAttributes() == null ? null : valPckgAttrAccess.execute(attributableValue.getAttributes());
                     String valAttr = RRuntime.asStringLengthOne(valAttrObj);
                     // GNUR uses == to compare strings here
-                    if (valAttr != null && valAttr != pckgAttr) {
+                    if (valAttr != null && !valAttr.equals(pckgAttr)) {
                         return RNull.instance;
                     }
                 }