Apply ReplaceWithPrimitiveObjectKindOf to lib/truffle as well

eregon · eregon · commit 9320476b4c5b · 2023-04-24T15:04:55.000+02:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -423,4 +423,5 @@ TruffleRuby/ReplaceWithPrimitiveObjectEqual:
 TruffleRuby/ReplaceWithPrimitiveObjectKindOf:
   Enabled: true
   Include: # inspect *only* these files
+    - lib/truffle/**/*.rb
     - src/main/ruby/**/*.rb
diff --git a/lib/truffle/readline.rb b/lib/truffle/readline.rb
@@ -64,7 +64,7 @@ def self.completion_proc=(proc)
 
     Primitive.readline_set_completion_proc -> buffer {
       result = proc.call(buffer)
-      unless Array === result
+      unless Primitive.is_a?(result, Array)
         result = Array(result)
       end
       result.map do |e|
diff --git a/lib/truffle/socket/addrinfo.rb b/lib/truffle/socket/addrinfo.rb
@@ -99,7 +99,7 @@ def self.raw_with_family(family)
   end
 
   def initialize(sockaddr, pfamily = nil, socktype = 0, protocol = 0)
-    if sockaddr.kind_of?(Array)
+    if Primitive.is_a?(sockaddr, Array)
       @afamily    = Truffle::Socket.address_family(sockaddr[0])
       @ip_port    = sockaddr[1]
       @ip_address = sockaddr[3]
@@ -138,7 +138,7 @@ def initialize(sockaddr, pfamily = nil, socktype = 0, protocol = 0)
     end
 
     # MRI only checks this if "sockaddr" is an Array.
-    if sockaddr.kind_of?(Array)
+    if Primitive.is_a?(sockaddr, Array)
       if @afamily == Socket::AF_INET6
         if Socket.sockaddr_in(0, @ip_address).bytesize != 28
           raise SocketError, "Invalid IPv6 address: #{@ip_address.inspect}"
@@ -158,7 +158,7 @@ def initialize(sockaddr, pfamily = nil, socktype = 0, protocol = 0)
     end
 
     # Per MRI this validation should only happen when "sockaddr" is an Array.
-    if sockaddr.is_a?(Array)
+    if Primitive.is_a?(sockaddr, Array)
       case @socktype
       when 0, nil
         if @protocol != 0 and !Primitive.nil?(@protocol) and @protocol != Socket::IPPROTO_UDP
diff --git a/lib/truffle/socket/ancillary_data.rb b/lib/truffle/socket/ancillary_data.rb
@@ -36,7 +36,7 @@ def self.int(family, level, type, integer)
 
     def self.unix_rights(*ios)
       descriptors = ios.map do |io|
-        unless io.is_a?(IO)
+        unless Primitive.is_a?(io, IO)
           raise TypeError, "IO expected, got #{Primitive.class(io)} instead"
         end
 
diff --git a/lib/truffle/socket/basic_socket.rb b/lib/truffle/socket/basic_socket.rb
@@ -85,14 +85,14 @@ def setsockopt(*args)
     when false then optval = 0
     end
 
-    if optval.is_a?(Integer)
+    if Primitive.is_a?(optval, Integer)
       Truffle::Socket::Foreign.memory_pointer(:socklen_t) do |pointer|
         pointer.write_int(optval)
 
         error = Truffle::Socket::Foreign
           .setsockopt(Primitive.io_fd(self), level, optname, pointer, pointer.total)
       end
-    elsif optval.is_a?(String)
+    elsif Primitive.is_a?(optval, String)
       Truffle::Socket::Foreign.memory_pointer(optval.bytesize) do |pointer|
         pointer.write_bytes(optval)
 
@@ -121,14 +121,14 @@ def send(message, flags, dest_sockaddr = nil)
     bytes      = message.bytesize
     bytes_sent = 0
 
-    if dest_sockaddr.is_a?(Addrinfo)
+    if Primitive.is_a?(dest_sockaddr, Addrinfo)
       dest_sockaddr = dest_sockaddr.to_sockaddr
     end
 
     Truffle::Socket::Foreign.char_pointer(bytes) do |buffer|
       buffer.write_bytes(message)
 
-      if dest_sockaddr.is_a?(String)
+      if Primitive.is_a?(dest_sockaddr, String)
         addr = Truffle::Socket.sockaddr_class_for_socket(self)
           .with_sockaddr(dest_sockaddr)
 
@@ -254,11 +254,11 @@ def recv(bytes_to_read, flags = 0, buf = nil)
 
       header.message = io_vec
 
-      if dest_sockaddr.is_a?(Addrinfo)
+      if Primitive.is_a?(dest_sockaddr, Addrinfo)
         dest_sockaddr = dest_sockaddr.to_sockaddr
       end
 
-      if dest_sockaddr.is_a?(String)
+      if Primitive.is_a?(dest_sockaddr, String)
         address = Truffle::Socket::Foreign::SockaddrIn.with_sockaddr(dest_sockaddr)
 
         header.address = address
diff --git a/lib/truffle/socket/socket.rb b/lib/truffle/socket/socket.rb
@@ -49,7 +49,7 @@ def self.getaddrinfo(host, service, family = 0, socktype = 0,
       host = '255.255.255.255'
     end
 
-    if service.kind_of?(Integer)
+    if Primitive.is_a?(service, Integer)
       service = service.to_s
     elsif service
       service = Truffle::Socket.coerce_to_string(service)
@@ -93,7 +93,7 @@ def self.getnameinfo(sockaddr, flags = 0)
     host   = nil
     family = Socket::AF_UNSPEC
 
-    if sockaddr.is_a?(Array)
+    if Primitive.is_a?(sockaddr, Array)
       if sockaddr.size == 3
         af, port, host = sockaddr
       elsif sockaddr.size == 4
@@ -237,7 +237,7 @@ def self.pack_sockaddr_in(port, host)
   end
 
   def self.unpack_sockaddr_in(addr)
-    addr = addr.to_sockaddr if addr.is_a?(Addrinfo)
+    addr = addr.to_sockaddr if Primitive.is_a?(addr, Addrinfo)
     _, address, port = Truffle::Socket::Foreign
       .unpack_sockaddr_in(addr, false)
 
@@ -289,7 +289,7 @@ def self.pack_sockaddr_un(file)
     end
 
     def self.unpack_sockaddr_un(addr)
-      addr = addr.to_sockaddr if addr.is_a?(Addrinfo)
+      addr = addr.to_sockaddr if Primitive.is_a?(addr, Addrinfo)
       struct = Truffle::Socket::Foreign::SockaddrUn.with_sockaddr(addr)
       begin
         unless struct.family == Socket::AF_UNIX
@@ -321,7 +321,7 @@ def initialize(family, socket_type, protocol = 0)
   end
 
   def bind(addr)
-    if addr.is_a?(Addrinfo)
+    if Primitive.is_a?(addr, Addrinfo)
       addr = addr.to_sockaddr
     end
 
@@ -333,7 +333,7 @@ def bind(addr)
   end
 
   def connect(sockaddr)
-    if sockaddr.is_a?(Addrinfo)
+    if Primitive.is_a?(sockaddr, Addrinfo)
       sockaddr = sockaddr.to_sockaddr
     end
 
@@ -347,7 +347,7 @@ def connect(sockaddr)
   private def __connect_nonblock(sockaddr, exception)
     self.nonblock = true
 
-    if sockaddr.is_a?(Addrinfo)
+    if Primitive.is_a?(sockaddr, Addrinfo)
       sockaddr = sockaddr.to_sockaddr
     end
 
diff --git a/lib/truffle/socket/tcp_socket.rb b/lib/truffle/socket/tcp_socket.rb
@@ -50,7 +50,7 @@ def initialize(host, service, local_host = nil, local_service = nil)
       host = Truffle::Socket.coerce_to_string(host)
     end
 
-    if service.is_a?(Integer)
+    if Primitive.is_a?(service, Integer)
       service = service.to_s
     else
       service = Truffle::Socket.coerce_to_string(service)
@@ -65,7 +65,7 @@ def initialize(host, service, local_host = nil, local_service = nil)
         local_host = Truffle::Socket.coerce_to_string(local_host)
       end
 
-      if local_service.is_a?(Integer)
+      if Primitive.is_a?(local_service, Integer)
         local_service = local_service.to_s
       elsif local_service
         local_service = Truffle::Socket.coerce_to_string(local_service)
diff --git a/lib/truffle/socket/truffle.rb b/lib/truffle/socket/truffle.rb
@@ -55,7 +55,7 @@ def self.config(struct_class, base, *fields)
                    type.to_sym
                  end
 
-        if !(Array === type) && ::FFI.find_type(type).size != size
+        if !(Primitive.is_a?(type, Array)) && ::FFI.find_type(type).size != size
           raise ArgumentError, "FFI::Type#size of #{type} (#{::FFI.find_type(type).size}) differs from config size (#{size})"
         end
 
@@ -73,12 +73,12 @@ def self.aliases_for_hostname(hostname)
     end
 
     def self.sockaddr_class_for_socket(socket)
-      if socket.is_a?(::UNIXSocket)
+      if Primitive.is_a?(socket, ::UNIXSocket)
         return Foreign::SockaddrUn
       end
 
       # Socket created using for example Socket.unix('foo')
-      if socket.is_a?(::Socket) and
+      if Primitive.is_a?(socket, ::Socket) and
         socket.instance_variable_get(:@family) == ::Socket::AF_UNIX
         return Foreign::SockaddrUn
       end
@@ -159,7 +159,7 @@ def self.constant_pairs
     end
 
     def self.coerce_to_string(object)
-      if object.is_a?(String) or object.is_a?(Symbol)
+      if Primitive.is_a?(object, String) or Primitive.is_a?(object, Symbol)
         object.to_s
       elsif object.respond_to?(:to_str)
         Truffle::Type.coerce_to(object, String, :to_str)
diff --git a/lib/truffle/socket/truffle/ancillary_data.rb b/lib/truffle/socket/truffle/ancillary_data.rb
@@ -38,7 +38,7 @@ module AncillaryData
       }
 
       def self.level(raw_level)
-        if raw_level.is_a?(Integer)
+        if Primitive.is_a?(raw_level, Integer)
           raw_level
         else
           level = Socket.coerce_to_string(raw_level)
@@ -56,7 +56,7 @@ def self.level(raw_level)
       end
 
       def self.type(family, level, raw_type)
-        if raw_type.is_a?(Integer)
+        if Primitive.is_a?(raw_type, Integer)
           raw_type
         else
           type = Socket.coerce_to_string(raw_type)
diff --git a/lib/truffle/socket/truffle/foreign/linger.rb b/lib/truffle/socket/truffle/foreign/linger.rb
@@ -49,7 +49,7 @@ def linger
         end
 
         def on_off=(value)
-          if value.is_a?(Integer)
+          if Primitive.is_a?(value, Integer)
             self[:l_onoff] = value
           else
             self[:l_onoff] = value ? 1 : 0
diff --git a/lib/truffle/socket/truffle/socket_options.rb b/lib/truffle/socket/truffle/socket_options.rb
@@ -38,7 +38,7 @@ def self.getsockopt(socket, family, level, optname)
       end
 
       def self.socket_level(level, family = nil)
-        if level.is_a?(Symbol) or level.is_a?(String)
+        if Primitive.is_a?(level, Symbol) or Primitive.is_a?(level, String)
           if ::Socket.const_defined?(level, false) # Truffle: added inherit false
             ::Socket.const_get(level, false) # Truffle: added inherit false
           else
diff --git a/lib/truffle/stringio.rb b/lib/truffle/stringio.rb
@@ -154,7 +154,7 @@ def initialize(string = nil, mode = nil, **options)
     end
 
     if mode
-      if mode.is_a?(Integer)
+      if Primitive.is_a?(mode, Integer)
         mode_from_integer(mode)
       else
         mode = StringValue(mode)
@@ -430,7 +430,7 @@ def pos=(pos)
   def putc(obj)
     check_writable
 
-    if obj.is_a?(String)
+    if Primitive.is_a?(obj, String)
       char = obj[0]
     else
       c = Truffle::Type.coerce_to obj, Integer, :to_int
@@ -494,7 +494,7 @@ def readlines(sep = $/, limit = Undefined, chomp: false)
   end
 
   def reopen(string = nil, mode = Undefined)
-    if string and not string.kind_of? String and Primitive.equal?(mode, Undefined)
+    if string and not Primitive.is_a?(string, String) and Primitive.equal?(mode, Undefined)
       stringio = Truffle::Type.coerce_to(string, StringIO, :to_strio)
 
       initialize_copy stringio
@@ -592,7 +592,7 @@ def truncate(length)
   def ungetc(char)
     check_readable
 
-    if char.kind_of? Integer
+    if Primitive.is_a?(char, Integer)
       char = Truffle::Type.coerce_to char, String, :chr
     else
       char = Truffle::Type.coerce_to char, String, :to_str
@@ -622,7 +622,7 @@ def ungetbyte(bytes)
 
     return unless bytes
 
-    if bytes.kind_of? Integer
+    if Primitive.is_a?(bytes, Integer)
       bytes = ''.b << (bytes & 0xff)
     else
       bytes = StringValue(bytes).b
diff --git a/lib/truffle/strscan.rb b/lib/truffle/strscan.rb
@@ -77,7 +77,7 @@ def pos=(n)
 
   def [](n)
     if @match
-      raise TypeError, "no implicit conversion of #{Primitive.class(n)} into Integer" if Range === n
+      raise TypeError, "no implicit conversion of #{Primitive.class(n)} into Integer" if Primitive.is_a?(n, Range)
       @match[n]
     end
   end
diff --git a/lib/truffle/truffle/cext.rb b/lib/truffle/truffle/cext.rb
@@ -286,7 +286,7 @@ def rb_obj_is_kind_of(object, ruby_class)
   end
 
   def SYMBOL_P(value)
-    Symbol === value
+    Primitive.is_a?(value, Symbol)
   end
 
   def rb_to_int(val)
@@ -500,7 +500,7 @@ def rb_f_global_variables
 
   def rb_ivar_foreach(object, func, arg)
     keys_and_vals = []
-    if Module === object
+    if Primitive.is_a?(object, Module)
       keys_and_vals << :__classpath__
       keys_and_vals << object.name
 
@@ -698,7 +698,7 @@ def events_to_events_array(events)
     parse_event = -> bits, name do
       if events.anybits? bits
         events ^= bits
-        if Symbol === name
+        if Primitive.is_a?(name, Symbol)
           events_ary << name
         else
           warn "warning: rb_tracepoint_new(#{name}) is not yet implemented" if $VERBOSE
@@ -1297,7 +1297,7 @@ class << ruby_class
   end
 
   def rb_get_alloc_func(ruby_class)
-    return nil unless Class === ruby_class
+    return nil unless Primitive.is_a?(ruby_class, Class)
     begin
       allocate_method = ruby_class.method(:__allocate__).owner
     rescue NameError
@@ -1858,7 +1858,7 @@ def rb_tr_log_warning(message)
   end
 
   def rb_convert_to_encoding(encoding)
-    if Encoding === encoding
+    if Primitive.is_a?(encoding, Encoding)
       encoding
     else
       Encoding.find(encoding.to_str)
diff --git a/lib/truffle/truffle/ffi_backend/function.rb b/lib/truffle/truffle/ffi_backend/function.rb
diff --git a/lib/truffle/truffle/ffi_backend/struct.rb b/lib/truffle/truffle/ffi_backend/struct.rb
diff --git a/lib/truffle/truffle/ffi_backend/struct_layout.rb b/lib/truffle/truffle/ffi_backend/struct_layout.rb
diff --git a/lib/truffle/truffle/ffi_backend/type.rb b/lib/truffle/truffle/ffi_backend/type.rb
diff --git a/lib/truffle/truffle/fiddle_backend.rb b/lib/truffle/truffle/fiddle_backend.rb
