Pass an integer number of bytes to #stack_alloc

Author: eregon

lib/truffle/socket/truffle/foreign.rb

@@ -120,7 +120,7 @@ def self.connect(descriptor, sockaddr)
       end
 
       def self.getsockopt(descriptor, level, optname)
-        val, length = Truffle::FFI::Pool.stack_alloc(:char, 256, :socklen_t, 1)
+        val, length = Truffle::FFI::Pool.stack_alloc(256, Primitive.pointer_find_type_size(:socklen_t))
 
         begin
           length.write_int(256)
@@ -199,7 +199,7 @@ def self.getnameinfo(sockaddr, flags = ::Socket::NI_NUMERICHOST | ::Socket::NI_N
         name_info = []
 
         sockaddr_p, node, service = Truffle::FFI::Pool.stack_alloc(
-          :char, sockaddr.bytesize, :char, ::Socket::NI_MAXHOST, :char, ::Socket::NI_MAXSERV)
+          sockaddr.bytesize, ::Socket::NI_MAXHOST, ::Socket::NI_MAXSERV)
 
         begin
           sockaddr_p.write_bytes(sockaddr)
@@ -232,7 +232,7 @@ def self.getnameinfo(sockaddr, flags = ::Socket::NI_NUMERICHOST | ::Socket::NI_N
       end
 
       def self.getpeername(descriptor)
-        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(:char, 128, :socklen_t, 1)
+        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(128, Primitive.pointer_find_type_size(:socklen_t))
         begin
           len_p.write_int(128)
 
@@ -247,7 +247,7 @@ def self.getpeername(descriptor)
       end
 
       def self.getsockname(descriptor)
-        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(:char, 128, :socklen_t, 1)
+        sockaddr_storage_p, len_p = Truffle::FFI::Pool.stack_alloc(128, Primitive.pointer_find_type_size(:socklen_t))
 
         begin
           len_p.write_int(128)

src/main/ruby/truffleruby/core/truffle/ffi/pointer.rb

@@ -271,18 +271,10 @@ class Pool
     def self.stack_alloc(*args)
       total_length = 0
       offsets = []
-      args.each_slice(2) do |type, count|
-        type_size = case type
-                    when nil
-                      1
-                    when Integer
-                      type
-                    when Symbol
-                      Primitive.pointer_find_type_size(type)
-                    else
-                      raise ArgumentError, "incorrect pointer type: #{type.inspect}"
-                    end
-        length = (type_size * count)
+      args.each do |length|
+        unless Primitive.object_kind_of?(length, Integer)
+          raise ArgumentError, "incorrect pointer type: #{length.inspect}"
+        end
         offsets << [total_length, length]
         total_length += length
       end

src/main/ruby/truffleruby/core/truffle/io_operations.rb

@@ -137,7 +137,7 @@ def self.select(readables, readable_ios, writables, writable_ios, errorables, er
       end
 
       readables_pointer, writables_pointer, errorables_pointer =
-          Truffle::FFI::Pool.stack_alloc(:int, readables.size, :int, writables.size, :int, errorables.size)
+          Truffle::FFI::Pool.stack_alloc(readables.size * SIZEOF_INT, writables.size * SIZEOF_INT, errorables.size * SIZEOF_INT)
 
       begin
         to_fds(readable_ios, readables_pointer)