Apply ReplaceWithPrimitiveNil to lib/truffle as well

eregon · eregon · commit 72f1c7ef5e14 · 2023-04-24T15:04:44.000+02:00
* Also add Primitive.interop_null?
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -12,6 +12,7 @@ AllCops:
   Exclude:
     - 'lib/truffle/date/format.rb' # crashes Rubocop in VariableForce
     - 'lib/truffle/date/delta/parser.rb' # generated code
+    - 'lib/truffle/pathname.rb' # from upstream and should be upstreamed
     - 'lib/truffle/socket/mri.rb' # taken from MRI
     - 'lib/truffle/ffi/**/*.rb' # taken from FFI gem
     - 'src/main/ruby/truffleruby/core/truffle/ffi/pointer_extra.rb' # taken from FFI gem
@@ -401,6 +402,7 @@ Layout/SpaceAroundEqualsInParameterDefault:
 TruffleRuby/ReplaceWithPrimitiveNil:
   Enabled: true
   Include: # inspect *only* this directory
+    - lib/truffle/**/*.rb
     - src/main/ruby/**/*.rb
 
 # Supports --auto-correct
diff --git a/lib/cext/ABI_check.txt b/lib/cext/ABI_check.txt
@@ -1 +1 @@
-5
+6
diff --git a/lib/truffle/continuation.rb b/lib/truffle/continuation.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
diff --git a/lib/truffle/coverage.rb b/lib/truffle/coverage.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
diff --git a/lib/truffle/digest/bubblebabble.rb b/lib/truffle/digest/bubblebabble.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
diff --git a/lib/truffle/fcntl.rb b/lib/truffle/fcntl.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
diff --git a/lib/truffle/ffi.rb b/lib/truffle/ffi.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
diff --git a/lib/truffle/objspace.rb b/lib/truffle/objspace.rb
@@ -14,7 +14,7 @@ def self.count_nodes_method(method, nodes)
 
     until node_stack.empty?
       node = node_stack.pop
-      next if node.nil?
+      next if Primitive.nil?(node)
 
       name = node.first
       children = node.drop(1)
diff --git a/lib/truffle/pathname.rb b/lib/truffle/pathname.rb
@@ -1,5 +1,5 @@
 # truffleruby_primitives: true
-#
+
 # = pathname.rb
 #
 # Object-Oriented Pathname Class
diff --git a/lib/truffle/rbconfig.rb b/lib/truffle/rbconfig.rb
@@ -1,6 +1,6 @@
-# truffleruby_primitives: true
 # frozen-string-literal: false
-#
+# truffleruby_primitives: true
+
 # Copyright (c) 2014, 2023 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
diff --git a/lib/truffle/readline.rb b/lib/truffle/readline.rb
@@ -54,7 +54,7 @@ class << self
   end
 
   def self.completion_append_character=(char)
-    char = '' if char == nil
+    char = '' if Primitive.nil?(char)
     char = String(char)
     @completion_append_character = char.empty? ? nil : char[0]
   end
diff --git a/lib/truffle/socket.rb b/lib/truffle/socket.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/addrinfo.rb b/lib/truffle/socket/addrinfo.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
@@ -159,7 +161,7 @@ def initialize(sockaddr, pfamily = nil, socktype = 0, protocol = 0)
     if sockaddr.is_a?(Array)
       case @socktype
       when 0, nil
-        if @protocol != 0 and @protocol != nil and @protocol != Socket::IPPROTO_UDP
+        if @protocol != 0 and !Primitive.nil?(@protocol) and @protocol != Socket::IPPROTO_UDP
           raise SocketError, 'Socket protocol must be IPPROTO_UDP or left unset'
         end
       when Socket::SOCK_RAW
diff --git a/lib/truffle/socket/ancillary_data.rb b/lib/truffle/socket/ancillary_data.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/basic_socket.rb b/lib/truffle/socket/basic_socket.rb
@@ -182,7 +182,7 @@ def recv(bytes_to_read, flags = 0, buf = nil)
     if socket_type == Socket::SOCK_STREAM
       grow_msg = false
     else
-      grow_msg = max_msg_len.nil?
+      grow_msg = Primitive.nil?(max_msg_len)
     end
 
     flags |= Socket::MSG_PEEK if grow_msg
diff --git a/lib/truffle/socket/constants.rb b/lib/truffle/socket/constants.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/ifaddr.rb b/lib/truffle/socket/ifaddr.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/ip_socket.rb b/lib/truffle/socket/ip_socket.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
@@ -64,7 +66,7 @@ def peeraddr(reverse_lookup = nil)
   end
 
   def recvfrom(maxlen, flags = 0)
-    flags = 0 if flags.nil?
+    flags = 0 if Primitive.nil?(flags)
     internal_recvfrom(maxlen, flags, nil, true)
   end
 end
diff --git a/lib/truffle/socket/option.rb b/lib/truffle/socket/option.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/socket_error.rb b/lib/truffle/socket/socket_error.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/tcp_server.rb b/lib/truffle/socket/tcp_server.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/tcp_socket.rb b/lib/truffle/socket/tcp_socket.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle.rb b/lib/truffle/socket/truffle.rb
@@ -320,7 +320,7 @@ def self.socket_type(type)
     end
 
     def self.convert_reverse_lookup(socket = nil, reverse_lookup = nil)
-      if reverse_lookup.nil?
+      if Primitive.nil?(reverse_lookup)
         if socket
           reverse_lookup = !socket.do_not_reverse_lookup
         else
diff --git a/lib/truffle/socket/truffle/ancillary_data.rb b/lib/truffle/socket/truffle/ancillary_data.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/bsd.rb b/lib/truffle/socket/truffle/bsd.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/error.rb b/lib/truffle/socket/truffle/error.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/addrinfo.rb b/lib/truffle/socket/truffle/foreign/addrinfo.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/hostent.rb b/lib/truffle/socket/truffle/foreign/hostent.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/ifaddrs.rb b/lib/truffle/socket/truffle/foreign/ifaddrs.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/iovec.rb b/lib/truffle/socket/truffle/foreign/iovec.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/linger.rb b/lib/truffle/socket/truffle/foreign/linger.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/msghdr.rb b/lib/truffle/socket/truffle/foreign/msghdr.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/servent.rb b/lib/truffle/socket/truffle/foreign/servent.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/sockaddr.rb b/lib/truffle/socket/truffle/foreign/sockaddr.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/sockaddr_in.rb b/lib/truffle/socket/truffle/foreign/sockaddr_in.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/sockaddr_in6.rb b/lib/truffle/socket/truffle/foreign/sockaddr_in6.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/foreign/sockaddr_un.rb b/lib/truffle/socket/truffle/foreign/sockaddr_un.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/ipv6.rb b/lib/truffle/socket/truffle/ipv6.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/linux.rb b/lib/truffle/socket/truffle/linux.rb
@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/truffle/socket_options.rb b/lib/truffle/socket/truffle/socket_options.rb
@@ -1,5 +1,5 @@
 # truffleruby_primitives: true
-#
+
 # Copyright (c) 2013, Brian Shirai
 # All rights reserved.
 #
diff --git a/lib/truffle/socket/udp_socket.rb b/lib/truffle/socket/udp_socket.rb
@@ -76,7 +76,7 @@ def send(message, flags, host = nil, port = nil)
   private def __recvfrom_nonblock(maxlen, flags, buffer, exception)
     self.nonblock = true
 
-    flags = 0 if flags.nil?
+    flags = 0 if Primitive.nil?(flags)
 
     internal_recvfrom(maxlen, flags | Socket::MSG_DONTWAIT, buffer, exception)
   end
diff --git a/lib/truffle/stringio.rb b/lib/truffle/stringio.rb
@@ -51,7 +51,7 @@ def readline(sep = $/, limit = ::Undefined, chomp: false)
   def sysread(length = nil, buffer = nil)
     str = read(length, buffer)
 
-    if str.nil?
+    if Primitive.nil?(str)
       raise EOFError, 'end of file reached'
     end
 
@@ -62,7 +62,7 @@ def sysread(length = nil, buffer = nil)
   def read_nonblock(length, buffer = nil, exception: true)
     str = read(length, buffer)
 
-    if exception and str.nil?
+    if exception and Primitive.nil?(str)
       raise EOFError, 'end of file reached'
     end
 
@@ -145,7 +145,7 @@ def initialize(string = nil, mode = nil, **options)
 
     mode, _binary, _external, _internal, _autoclose, _perm = IO.normalize_options(mode, nil, options)
 
-    if string.nil?
+    if Primitive.nil?(string)
       mode ||= IO::RDWR
       @__data__ = Data.new ''.force_encoding(Encoding.default_external)
     else
@@ -714,7 +714,7 @@ def yaml_initialize(type, val)
     else
       limit = nil
 
-      unless sep == $/ or sep.nil?
+      unless sep == $/ or Primitive.nil?(sep)
         osep = sep
         sep = Truffle::Type.rb_check_convert_type sep, String, :to_str
         unless sep
@@ -737,7 +737,7 @@ def yaml_initialize(type, val)
       string = d.string
       bytesize = string.bytesize
 
-      if sep.nil?
+      if Primitive.nil?(sep)
         if limit
           line = string.byteslice(pos, limit)
         else
diff --git a/lib/truffle/strscan.rb b/lib/truffle/strscan.rb
@@ -294,7 +294,7 @@ def terminate
   end
 
   def unscan
-    raise ScanError if @match.nil?
+    raise ScanError if Primitive.nil?(@match)
     @pos = @prev_pos
     @prev_pos = nil
     @match = nil
diff --git a/lib/truffle/thread.rb b/lib/truffle/thread.rb
@@ -1,3 +1,4 @@
+# truffleruby_primitives: true
 # Truffle: Last version of lib/thread.rb in MRI @ r42801 (324df61e).
 
 #
diff --git a/lib/truffle/timeout.rb b/lib/truffle/timeout.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+# truffleruby_primitives: true
+
 #--
 # = timeout.rb
 #
@@ -155,7 +157,7 @@ def timeout(sec, exception = Error, message = nil)
     # module method, so you can call it directly as Timeout.timeout().
 
     def timeout(sec, exception = Error, message = nil)
-      return yield if sec == nil or sec.zero?
+      return yield if Primitive.nil?(sec) or sec.zero?
 
       message ||= 'execution expired'
       req = Timeout.add_timeout sec, exception, message
diff --git a/lib/truffle/truffle/cext.rb b/lib/truffle/truffle/cext.rb
diff --git a/lib/truffle/truffle/cext_structs.rb b/lib/truffle/truffle/cext_structs.rb
diff --git a/lib/truffle/truffle/ffi_backend.rb b/lib/truffle/truffle/ffi_backend.rb
diff --git a/lib/truffle/truffle/ffi_backend/buffer.rb b/lib/truffle/truffle/ffi_backend/buffer.rb
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/last_error.rb b/lib/truffle/truffle/ffi_backend/last_error.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/fiddle_backend.rb b/lib/truffle/truffle/fiddle_backend.rb
diff --git a/lib/truffle/truffleruby/ffi_backend.rb b/lib/truffle/truffleruby/ffi_backend.rb
diff --git a/spec/truffle/objspace/define_finalizer_spec.rb b/spec/truffle/objspace/define_finalizer_spec.rb
diff --git a/src/main/java/org/truffleruby/interop/InteropNodes.java b/src/main/java/org/truffleruby/interop/InteropNodes.java
diff --git a/src/main/ruby/truffleruby/core/posix.rb b/src/main/ruby/truffleruby/core/posix.rb
diff --git a/tool/jt.rb b/tool/jt.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# truffleruby_primitives: true`
	`2`	`+`
`1`	`3`	`# Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved. This`
`2`	`4`	`# code is released under a tri EPL/GPL/LGPL license. You can use it,`
`3`	`5`	`# redistribute it and/or modify it under the terms of the:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# truffleruby_primitives: true`
	`2`	`+`
`1`	`3`	`# Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved. This`
`2`	`4`	`# code is released under a tri EPL/GPL/LGPL license. You can use it,`
`3`	`5`	`# redistribute it and/or modify it under the terms of the:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# truffleruby_primitives: true`
	`2`	`+`
`1`	`3`	`# Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. This`
`2`	`4`	`# code is released under a tri EPL/GPL/LGPL license. You can use it,`
`3`	`5`	`# redistribute it and/or modify it under the terms of the:`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# truffleruby_primitives: true`
`2`		`-#`
	`2`	`+`
`3`	`3`	`# = pathname.rb`
`4`	`4`	`#`
`5`	`5`	`# Object-Oriented Pathname Class`