[GR-13337] Update to latest mx (and thus SpotBugs) version.

lukasstadler · lukasstadler · commit 8716afd26d0a · 2019-02-20T07:02:32.000-08:00
PullRequest: fastr/1922
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RFileTypeDetector.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RFileTypeDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -31,10 +31,12 @@
 public final class RFileTypeDetector extends FileTypeDetector {
     @Override
     public String probeContentType(Path path) throws IOException {
-
-        String fileName = path.getFileName().toString();
-        if (fileName.endsWith(".R") || fileName.endsWith(".r")) {
-            return RRuntime.R_TEXT_MIME;
+        Path fileNamePath = path.getFileName();
+        if (fileNamePath != null) {
+            String fileName = fileNamePath.toString();
+            if (fileName.endsWith(".R") || fileName.endsWith(".r")) {
+                return RRuntime.R_TEXT_MIME;
+            }
         }
         return null;
     }
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -251,7 +251,7 @@ private Object findCallerFromFrame(Frame frame) {
                     caller = caller.getParent();
                 }
             }
-            if (caller != null && caller.isValidCaller()) {
+            if (caller.isValidCaller()) {
                 // This is where we need to ensure that we have an RLanguage object with a rep that
                 // is an RSyntaxNode.
                 return getSyntaxCaller(caller);
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DLL.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DLL.java
@@ -224,7 +224,9 @@ public static LLVMArchive getZipLLVMIR(String path) throws IOException {
                     continue;
                 }
                 Path zipName = Paths.get(entry.getName());
-                String name = zipName.getFileName().toString();
+                Path fileNamePath = zipName.getFileName();
+                assert fileNamePath != null;
+                String name = fileNamePath.toString();
                 int ix = name.indexOf('.');
                 if (ix > 0) {
                     name = name.substring(0, ix);
@@ -378,7 +380,9 @@ public DLCloseNode createDLCloseNode() {
     }
 
     private static String getLibName(String path) {
-        String fileName = FileSystems.getDefault().getPath(path).getFileName().toString();
+        Path fileNamePath = FileSystems.getDefault().getPath(path).getFileName();
+        assert fileNamePath != null;
+        String fileName = fileNamePath.toString();
         int ix = fileName.lastIndexOf(".");
         return fileName.substring(0, ix);
     }
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.java
@@ -114,6 +114,7 @@ protected Object count(int conn, Object sep, Object quote, int nskipArg, boolean
         }
     }
 
+    @SuppressFBWarnings(value = "UC_USELESS_CONDITION", justification = "incomplete implementation")
     private static Object countFields(RConnection file, char sepChar, String quoteSet, @SuppressWarnings("unused") int nskip, boolean blskip, char comChar) throws IOException {
         LocalData data = new LocalData();
         data.sepchar = sepChar;
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/EagerResourceHandlerFactory.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/EagerResourceHandlerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.CodeSource;
 import java.util.Enumeration;
@@ -74,7 +75,9 @@ public URL getResource(Class<?> accessor, String name) {
     @Override
     public InputStream getResourceAsStream(Class<?> accessor, String name) {
         // actual resource
-        String fileName = Paths.get(name).getFileName().toString();
+        Path fileNamePath = Paths.get(name).getFileName();
+        assert fileNamePath != null;
+        String fileName = fileNamePath.toString();
         FileInfo fileInfo = files.get(fileName);
         if (fileInfo == null || fileInfo.data == null) {
             return null;
@@ -108,7 +111,9 @@ private static void gatherResources() {
                     }
                     // using a proper jar URL causes build image problems
                     // and no-one really cares what the URL is - we have the data already
-                    String fileName = Paths.get(name).getFileName().toString();
+                    Path fileNamePath = Paths.get(name).getFileName();
+                    assert fileNamePath != null;
+                    String fileName = fileNamePath.toString();
                     files.put(fileName, new FileInfo(fileName, new URL("file://" + name), buf));
                 }
             }
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CompileFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CompileFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -136,7 +136,7 @@ protected boolean disassemble(@SuppressWarnings("unused") String symbol) {
     public abstract static class BcVersion extends RBuiltinNode.Arg0 {
 
         static {
-            Casts casts = new Casts(BcVersion.class);
+            Casts.noCasts(BcVersion.class);
         }
 
         @Specialization
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FrameFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/FrameFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -705,7 +705,7 @@ public int[] apply(Frame f) {
                             int currentCallIdx = currentCall.getDepth() - 1;
                             RCaller parent = currentCall.getParent();
                             RCaller previous = currentCall;
-                            while (parent != null & parent.isPromise()) {
+                            while (parent != null && parent.isPromise()) {
                                 if (parent.hasSysParent()) {
                                     // parent.frame explicitly set by Rf_eval(quote(foo()), env) to
                                     // env
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/HiddenInternalFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/HiddenInternalFunctions.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995-2012, The R Core Team
  * Copyright (c) 2003, The R Foundation
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2014, 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
@@ -470,7 +470,8 @@ public Object getSessionRef() {
                     if (!rc) {
                         throw error(Message.GENERIC, "zlib compress error");
                     }
-                } else if (compression == 3) {
+                } else {
+                    assert compression == 3;
                     ctype = RCompression.Type.XZ;
                     offset = 5;
                     outLen = data.length;
@@ -479,8 +480,6 @@ public Object getSessionRef() {
                     if (!rc) {
                         throw error(Message.GENERIC, "lzma compress error");
                     }
-                } else {
-                    throw RInternalError.shouldNotReachHere();
                 }
                 int[] intData = new int[2];
                 intData[1] = outLen + offset; // include length + type (compression == 3)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java
@@ -853,7 +853,7 @@ protected Object doSvd(String ju, RAbstractDoubleVector x, RAbstractDoubleVector
 
             int lwork = (int) tmp[0];
             double[] work = new double[lwork];
-            dgesddNode.execute(ju.charAt(0), n, p, xvals, n, sdata, udata, ldu, vtdata, ldvt, work, lwork, iwork);
+            info = dgesddNode.execute(ju.charAt(0), n, p, xvals, n, sdata, udata, ldu, vtdata, ldvt, work, lwork, iwork);
             if (info != 0) {
                 error(Message.LAPACK_ERROR, info, "dgesdd");
             }
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RowsumFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/RowsumFunctions.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995, 1996  Robert Gentleman and Ross Ihaka
  * Copyright (c) 1997-2015,  The R Core Team
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2016, 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
@@ -90,7 +90,7 @@ protected Object rowsum(RAbstractVector xv, RAbstractVector g, RAbstractVector u
             int[] matches = new int[n];
             for (int i = 0; i < n; i++) {
                 Integer hi = table.get(g.getDataAtAsObject(i));
-                matches[i] = xv == null ? 0 : hi + 1;
+                matches[i] = hi + 1;
             }
             int offset = 0;
             int offsetg = 0;
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/PrintParameters.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/PrintParameters.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995, 1996  Robert Gentleman and Ross Ihaka
  * Copyright (c) 1997-2013,  The R Core Team
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2016, 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
@@ -130,10 +130,8 @@ PrintParameters cloneParameters() {
 
     public static int getDefaultMaxPrint() {
         int max = RRuntime.asInteger(RContext.getInstance().stateROptions.getValue("max.print"));
-        if (max == RRuntime.INT_NA || max < 0) {
+        if (RRuntime.isNA(max) || max < 0) {
             max = 99999;
-        } else if (max == RRuntime.INT_NA) {
-            max--; // so we can add
         }
         return max;
     }
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/ValuePrinters.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/printer/ValuePrinters.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
@@ -111,7 +111,7 @@ public void print(Object v, PrintContext printCtx) throws IOException {
                     assert !(x instanceof RTypedValue) : x;
                     printer = TruffleObjectPrinter.INSTANCE;
                 } else {
-                    RInternalError.shouldNotReachHere("unexpected type: " + (x == null ? "null" : x.getClass()));
+                    RInternalError.shouldNotReachHere("unexpected type: " + x.getClass());
                 }
             }
             printer.print(x, printCtx);
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/casts/analysis/ForwardedValuesAnalyser.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/casts/analysis/ForwardedValuesAnalyser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -90,7 +90,7 @@ public ForwardingAnalysisResult visit(FindFirstStep<?, ?> step, ForwardingAnalys
         ForwardingAnalysisResult localRes = new ForwardingAnalysisResult().blockAll().setForwardedType(step.getElementClass(), FORWARDED);
         if (step.getDefaultValue() == RNull.instance) {
             // see CoercedPhaseBuilder.findFirstOrNull()
-            localRes.setNull(FORWARDED);
+            localRes = localRes.setNull(FORWARDED);
         }
         result = result.and(localRes);
         return result;
diff --git a/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java b/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.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
@@ -167,8 +167,11 @@ private static File mkTmpDir(File dir) throws IOException {
     }
 
     private static void deleteTmpDir(File dir) {
-        for (File f : dir.listFiles()) {
-            f.delete();
+        File[] files = dir.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                f.delete();
+            }
         }
         dir.delete();
     }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/LazyResourceHandlerFactory.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/LazyResourceHandlerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -88,8 +88,12 @@ public Map<String, String> getRFiles(Class<?> accessor, String pkgName) {
                     String name = entry.getName();
                     if (name.endsWith(".R") || name.endsWith(".r")) {
                         Path p = Paths.get(name);
-                        String entryPkg = p.getName(p.getNameCount() - 3).getFileName().toString();
-                        String entryParent = p.getName(p.getNameCount() - 2).getFileName().toString();
+                        Path entryPkgPath = p.getName(p.getNameCount() - 3).getFileName();
+                        assert entryPkgPath != null;
+                        String entryPkg = entryPkgPath.toString();
+                        Path entryParentPath = p.getName(p.getNameCount() - 2).getFileName();
+                        assert entryParentPath != null;
+                        String entryParent = entryParentPath.toString();
                         if (entryParent.equals("R") && entryPkg.equals(pkgName)) {
                             int size = (int) entry.getSize();
                             byte[] buf = new byte[size];
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RArguments.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RArguments.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
@@ -81,7 +81,7 @@
  * The INDEX_SUPPLIED_SIGNATURE is set to the permutation of the supplied signature that corresponds
  * to how the supplied arguments were permuted. The purpose of this slot is to store the names in the
  * original signature (especially positional vs. named) for later use in UseMethod.
- * 
+ *
  * The INDEX_CALLER_FRAME slot is used for either a {@link CallerFrameClosure} or the materialized
  * caller frame itself. Passing the materialized caller frame via arguments allows us to walk
  * the call stack without calling {@link com.oracle.truffle.api.TruffleRuntime#iterateFrames( FrameInstanceVisitor)},
@@ -191,8 +191,8 @@ public static Object[] create(RFunction function, RCaller call, Object callerFra
      */
     public static Object[] create(RFunction function, RCaller call, Object callerFrameObject, Object[] evaluatedArgs,
                     ArgumentsSignature suppliedSignature, MaterializedFrame enclosingFrame, DispatchArgs dispatchArgs) {
-        assert suppliedSignature.getLength() == evaluatedArgs.length : "suppliedSignature should match the evaluatedArgs (see Java docs).";
         assert evaluatedArgs != null : "RArguments.create evaluatedArgs is null";
+        assert suppliedSignature.getLength() == evaluatedArgs.length : "suppliedSignature should match the evaluatedArgs (see Java docs).";
         assert call != null : "RArguments.create call is null";
         assert callerFrameObject != null : "RArguments.create callerFrameObject is null";
         // Eventually we want to have this invariant
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RCompression.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RCompression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -179,7 +179,8 @@ private static boolean lzmaCompress(byte[] udata, byte[] cdata) {
         } catch (InterruptedException | IOException ex) {
             return false;
         }
-        return rc == 0;
+        assert rc != 0;
+        return false;
 
     }
 
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RSerialize.java
@@ -2852,6 +2852,7 @@ private static boolean setupLibPath(REnvironment environment) {
             if (pathObj instanceof RAbstractStringVector) {
                 String path = ((RAbstractStringVector) pathObj).getDataAt(0);
                 Path libLoc = Paths.get(path).getParent();
+                assert libLoc != null;
                 RContext.getInstance().libraryPaths.add(0, libLoc.toString());
                 return true;
             }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
@@ -302,7 +302,11 @@ private static String robustGetProperty(String name) {
 
     private static boolean robustCheckWriteable(Path logFile) {
         try {
-            return Files.isWritable(logFile.getParent()) && (!Files.exists(logFile) || Files.isWritable(logFile));
+            if (logFile == null) {
+                return false;
+            }
+            Path parent = logFile.getParent();
+            return parent != null && Files.isWritable(parent) && (!Files.exists(logFile) || Files.isWritable(logFile));
         } catch (Throwable ex) {
             // may throw SecurityException, we catch all since we really need to be robust
             logGetLogPathError(ex.getMessage());
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nmath/GammaFunctions.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/nmath/GammaFunctions.java
@@ -51,6 +51,7 @@
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RError.Message;
 import com.oracle.truffle.r.runtime.RRuntime;
+import com.oracle.truffle.r.runtime.SuppressFBWarnings;
 import com.oracle.truffle.r.runtime.Utils;
 import com.oracle.truffle.r.runtime.nmath.DPQ.EarlyReturn;
 import com.oracle.truffle.r.runtime.nmath.RMathError.MLError;
@@ -1248,6 +1249,7 @@ public static DpsiFnResult dpsifn(double x, int n, int kode, double ans, int nz,
 
     @TruffleBoundary
     @SuppressWarnings("all")
+    @SuppressFBWarnings(value = "UC_USELESS_CONDITION", justification = "taken from original implementation")
     private static void dpsifn(double x, int n, int kode, DpsiFnResult result) {
         int mm;
         int mx;
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/FileTreeWalker.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/FileTreeWalker.java
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/HTMLDumper.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/HTMLDumper.java
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -251,7 +251,7 @@ private Object findCallerFromFrame(Frame frame) {`
`251`	`251`	`caller = caller.getParent();`
`252`	`252`	`}`
`253`	`253`	`}`
`254`		`- if (caller != null && caller.isValidCaller()) {`
	`254`	`+ if (caller.isValidCaller()) {`
`255`	`255`	`// This is where we need to ensure that we have an RLanguage object with a rep that`
`256`	`256`	`// is an RSyntaxNode.`
`257`	`257`	`return getSyntaxCaller(caller);`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ protected Object count(int conn, Object sep, Object quote, int nskipArg, boolean`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ @SuppressFBWarnings(value = "UC_USELESS_CONDITION", justification = "incomplete implementation")`
`117`	`118`	`private static Object countFields(RConnection file, char sepChar, String quoteSet, @SuppressWarnings("unused") int nskip, boolean blskip, char comChar) throws IOException {`
`118`	`119`	`LocalData data = new LocalData();`
`119`	`120`	`data.sepchar = sepChar;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -136,7 +136,7 @@ protected boolean disassemble(@SuppressWarnings("unused") String symbol) {`
`136`	`136`	`public abstract static class BcVersion extends RBuiltinNode.Arg0 {`
`137`	`137`
`138`	`138`	`static {`
`139`		`- Casts casts = new Casts(BcVersion.class);`
	`139`	`+ Casts.noCasts(BcVersion.class);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`@Specialization`
Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ protected Object doSvd(String ju, RAbstractDoubleVector x, RAbstractDoubleVector`
`853`	`853`
`854`	`854`	`int lwork = (int) tmp[0];`
`855`	`855`	`double[] work = new double[lwork];`
`856`		`- dgesddNode.execute(ju.charAt(0), n, p, xvals, n, sdata, udata, ldu, vtdata, ldvt, work, lwork, iwork);`
	`856`	`+ info = dgesddNode.execute(ju.charAt(0), n, p, xvals, n, sdata, udata, ldu, vtdata, ldvt, work, lwork, iwork);`
`857`	`857`	`if (info != 0) {`
`858`	`858`	`error(Message.LAPACK_ERROR, info, "dgesdd");`
`859`	`859`	`}`