some cleanups

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/SocketBuiltins.java

@@ -98,7 +98,6 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PythonBuiltinClassType.PSocket)
-@SuppressWarnings("unused")
 public class SocketBuiltins extends PythonBuiltins {
 
     @Override
@@ -342,7 +341,7 @@ Object listen(PSocket socket, int backlog) {
 
         @Specialization
         @TruffleBoundary
-        Object listen(PSocket socket, PNone backlog) {
+        Object listen(PSocket socket, @SuppressWarnings("unused") PNone backlog) {
             return listen(socket, 50);
         }
     }
@@ -354,7 +353,7 @@ Object listen(PSocket socket, PNone backlog) {
     @GenerateNodeFactory
     abstract static class RecvNode extends PythonTernaryClinicBuiltinNode {
         @Specialization
-        Object recv(VirtualFrame frame, PSocket socket, int bufsize, int flags,
+        Object recv(VirtualFrame frame, PSocket socket, int bufsize, @SuppressWarnings("unused") int flags,
                         @Cached GilNode gil) {
             if (socket.getSocket() == null) {
                 throw raiseOSError(frame, OSErrorEnum.ENOTCONN);
@@ -385,11 +384,13 @@ protected ArgumentClinicProvider getArgumentClinic() {
     @Builtin(name = "recvfrom", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     abstract static class RecvFromNode extends PythonTernaryBuiltinNode {
+        @SuppressWarnings("unused")
         @Specialization
         Object recvFrom(PSocket socket, int bufsize, int flags) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
+        @SuppressWarnings("unused")
         @Specialization
         Object recvFrom(PSocket socket, int bufsize, PNone flags) {
             return PNotImplemented.NOT_IMPLEMENTED;
@@ -405,8 +406,7 @@ protected static SequenceStorageNodes.SetItemNode createSetItem() {
         }
 
         @Specialization
-        Object recvInto(VirtualFrame frame, PSocket socket, PMemoryView buffer, Object flags,
-                        @Cached ConditionProfile byteStorage,
+        Object recvInto(VirtualFrame frame, PSocket socket, PMemoryView buffer, @SuppressWarnings("unused") Object flags,
                         @Cached PyNumberAsSizeNode asSizeNode,
                         @Cached("create(__LEN__)") LookupAndCallUnaryNode callLen,
                         @Cached("create(__SETITEM__)") LookupAndCallTernaryNode setItem) {
@@ -435,7 +435,7 @@ Object recvInto(VirtualFrame frame, PSocket socket, PMemoryView buffer, Object f
         }
 
         @Specialization
-        Object recvInto(VirtualFrame frame, PSocket socket, PByteArray buffer, Object flags,
+        Object recvInto(VirtualFrame frame, PSocket socket, PByteArray buffer, @SuppressWarnings("unused") Object flags,
                         @Cached GilNode gil,
                         @Cached ConditionProfile byteStorage,
                         @Cached SequenceStorageNodes.LenNode lenNode,
@@ -488,16 +488,19 @@ Object recvInto(VirtualFrame frame, PSocket socket, PByteArray buffer, Object fl
     @Builtin(name = "recvmsg", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 4)
     @GenerateNodeFactory
     abstract static class RecvMsgNode extends PythonBuiltinNode {
+        @SuppressWarnings("unused")
         @Specialization
         Object recvFrom(PSocket socket, int bufsize, int ancbufsize, int flags) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
+        @SuppressWarnings("unused")
         @Specialization
         Object recvFrom(PSocket socket, int bufsize, int ancbufsize, PNone flags) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
+        @SuppressWarnings("unused")
         @Specialization
         Object recvFrom(PSocket socket, int bufsize, PNone ancbufsize, PNone flags) {
             return PNotImplemented.NOT_IMPLEMENTED;
@@ -509,7 +512,7 @@ Object recvFrom(PSocket socket, int bufsize, PNone ancbufsize, PNone flags) {
     @GenerateNodeFactory
     abstract static class SendNode extends PythonTernaryBuiltinNode {
         @Specialization
-        Object send(VirtualFrame frame, PSocket socket, PBytes bytes, Object flags,
+        Object send(VirtualFrame frame, PSocket socket, PBytes bytes, @SuppressWarnings("unused") Object flags,
                         @Cached GilNode gil,
                         @Cached SequenceStorageNodes.ToByteArrayNode toBytes) {
             // TODO: do not ignore flags
@@ -542,7 +545,7 @@ Object send(VirtualFrame frame, PSocket socket, PBytes bytes, Object flags,
     @GenerateNodeFactory
     abstract static class SendAllNode extends PythonTernaryBuiltinNode {
         @Specialization
-        Object sendAll(VirtualFrame frame, PSocket socket, PBytesLike bytes, Object flags,
+        Object sendAll(VirtualFrame frame, PSocket socket, PBytesLike bytes, @SuppressWarnings("unused") Object flags,
                         @Cached GilNode gil,
                         @Cached SequenceStorageNodes.ToByteArrayNode toBytes,
                         @Cached ConditionProfile hasTimeoutProfile) {
@@ -586,11 +589,13 @@ Object sendAll(VirtualFrame frame, PSocket socket, PBytesLike bytes, Object flag
     @Builtin(name = "sendto", minNumOfPositionalArgs = 3, maxNumOfPositionalArgs = 4)
     @GenerateNodeFactory
     abstract static class SendToNode extends PythonBuiltinNode {
+        @SuppressWarnings("unused")
         @Specialization
         Object sendTo(PSocket socket, Object bytes, int flags, Object address) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
+        @SuppressWarnings("unused")
         @Specialization
         Object sendTo(PSocket socket, Object bytes, PNone flags, Object address) {
             return PNotImplemented.NOT_IMPLEMENTED;
@@ -601,6 +606,7 @@ Object sendTo(PSocket socket, Object bytes, PNone flags, Object address) {
     @Builtin(name = "sendmsg", minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 5)
     @GenerateNodeFactory
     abstract static class SendMsgNode extends PythonBuiltinNode {
+        @SuppressWarnings("unused")
         @Specialization
         Object sendMsg(PSocket socket, Object buffers, Object ancdata, int flags, Object address) {
             return PNotImplemented.NOT_IMPLEMENTED;
@@ -743,6 +749,7 @@ int detach(PSocket socket) {
     @Builtin(name = "_setsockopt", minNumOfPositionalArgs = 4)
     @GenerateNodeFactory
     abstract static class SetSockOptNode extends PythonBuiltinNode {
+        @SuppressWarnings("unused")
         @Specialization
         Object setSockOpt(PSocket socket, Object level, Object optname, Object value, Object optlen) {
             return PNone.NONE;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java

@@ -52,7 +52,6 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode.NotImplementedHandler;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallTernaryNode;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -138,9 +137,8 @@ public NodeCost getCost() {
     }
 
     /**
-     * A helper root node that dispatches to {@link LookupAndCallTernaryNode} to execute the
-     * provided ternary operator. Note: this is just a root node and won't do any signature
-     * checking.
+     * A helper root node that dispatches to {@link LookupAndCallBinaryNode} to execute the provided
+     * ternary operator. Note: this is just a root node and won't do any signature checking.
      */
     static final class CallBinaryArithmeticRootNode extends CallArithmeticRootNode {
         static final Signature SIGNATURE_BINARY = new Signature(2, false, -1, false, new String[]{"$self", "other"}, null);