[GR-11030] Fix ECJ warnings in StatsFunctions#zeroin2 and LoadSaveFunctions.

PullRequest: fastr/1622

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/StatsFunctionsNodes.java

@@ -511,9 +511,12 @@ public final class StatsFunctionsNodes {
             casts.arg(6).asIntegerVector().findFirst().mustBe(gt0(), Message.MUST_BE_POSITIVE, "maxiter");
         }
 
-        @SuppressWarnings("all")
         @Specialization
-        protected RAbstractDoubleVector zeroin2(RFunction f, double xmin, double xmax, double fax, double fbx, double tol, int maxIter) {
+        protected RAbstractDoubleVector zeroin2(RFunction f, double xmin, double xmax, double faxArg, double fbxArg, double tolArg, int maxIterArg) {
+            double fax = faxArg;
+            double fbx = fbxArg;
+            double tol = tolArg;
+            int maxIter = maxIterArg;
             if (xmin >= xmax) {
                 error(Message.NOT_LESS_THAN, "xmin", "xmax");
             }
@@ -563,7 +566,7 @@ public final class StatsFunctionsNodes {
                     tolAct = 2 * EPSILON * fabs(b) + tol / 2;
                     newStep = (c - b) / 2;
 
-                    if (fabs(newStep) <= tolAct || fbx == (double) 0) {
+                    if (fabs(newStep) <= tolAct || fbx == 0.0d) {
                         maxIter -= maxit;
                         tol = fabs(c - b);
                         res = b;
@@ -591,7 +594,7 @@ public final class StatsFunctionsNodes {
                             p = t2 * (cb * q * (q - t1) - (b - a) * (t1 - 1.0));
                             q = (q - 1.0) * (t1 - 1.0) * (t2 - 1.0);
                         }
-                        if (p > (double) 0) { /* p was calculated with the */
+                        if (p > 0.0d) { /* p was calculated with the */
                             q = -q; /* opposite sign; make p positive */
                         } else { /* and assign possible minus to */
                             p = -p; /* q */
@@ -610,7 +613,7 @@ public final class StatsFunctionsNodes {
                     }
 
                     if (fabs(newStep) < tolAct) { /* Adjust the step to be not less */
-                        if (newStep > (double) 0) { /* than tolerance */
+                        if (newStep > 0.0d) { /* than tolerance */
                             newStep = tolAct;
                         } else {
                             newStep = -tolAct;
@@ -640,7 +643,7 @@ public final class StatsFunctionsNodes {
                             warning(Message.NA_REPLACED);
                             fbx = DBL_MAX;
                         } else {
-                            fbx = (double) i;
+                            fbx = i;
                         }
                     } else if (fRes instanceof Double) {
                         double d = (Double) fRes;

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LoadSaveFunctions.java

@@ -211,9 +211,8 @@ public class LoadSaveFunctions {
             casts.arg("eval.promises").asLogicalVector().findFirst().mustNotBeNA().map(toBoolean());
         }
 
-        @SuppressWarnings("all")
         @Specialization
-        protected Object saveToConn(VirtualFrame frame, RAbstractStringVector list, int con, boolean ascii, RNull version, REnvironment envir, boolean evalPromises,
+        protected Object saveToConn(VirtualFrame frame, RAbstractStringVector list, int con, boolean ascii, @SuppressWarnings("unused") RNull version, REnvironment envir, boolean evalPromises,
                         @Cached("new()") PromiseHelperNode promiseHelper) {
             RPairList prev = null;
             Object toSave = RNull.instance;
@@ -225,8 +224,7 @@ public class LoadSaveFunctions {
                     value = env.get(varName);
                     if (value != null) {
                         if (value instanceof RPromise) {
-                            // GNU R does not seem to honor evalPromises==false
-                            value = true || evalPromises
+                            value = evalPromises
                                             ? promiseHelper.evaluate(frame, (RPromise) value)
                                             : ((RPromise) value).getRawValue();
                         }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -83955,6 +83955,10 @@ $foo
 [1] 42
+##com.oracle.truffle.r.test.functions.TestFunctions.testMatching#Output.IgnoreErrorMessage#
+#foo <- function(...) bar(...); bar <- function(a,b) list(a,b); foo(a=1,b=2,c=3);
+Error in bar(...) : unused argument (c = 3)
+
 ##com.oracle.truffle.r.test.functions.TestFunctions.testMatching#
 #list(`...`=NULL);
 $...