Fix and spec against issue with loading Fiddle after the FFI

Author: chrisseaton

lib/truffle/truffle/fiddle_backend.rb

@@ -8,8 +8,8 @@
 
 module Truffle::FiddleBackend
 
-  SIZEOF_INT    = Truffle::FFI::Pointer.find_type_size(:int)
-  SIZEOF_LONG   = Truffle::FFI::Pointer.find_type_size(:long)
+  SIZEOF_INT    = Truffle.invoke_primitive(:pointer_find_type_size, :int)
+  SIZEOF_LONG   = Truffle.invoke_primitive(:pointer_find_type_size, :long)
 
   INT_NFI_TYPE  = "SINT#{SIZEOF_INT * 8}"
   UINT_NFI_TYPE  = "UINT#{SIZEOF_INT * 8}"
@@ -122,20 +122,20 @@ class DLError < StandardError
   TYPE_FLOAT        = 7
   TYPE_DOUBLE       = 8
 
-  SIZEOF_VOIDP      = Truffle::FFI::Pointer.find_type_size(:pointer)
-  SIZEOF_CHAR       = Truffle::FFI::Pointer.find_type_size(:char)
-  SIZEOF_SHORT      = Truffle::FFI::Pointer.find_type_size(:short)
+  SIZEOF_VOIDP      = Truffle.invoke_primitive(:pointer_find_type_size, :pointer)
+  SIZEOF_CHAR       = Truffle.invoke_primitive(:pointer_find_type_size, :char)
+  SIZEOF_SHORT      = Truffle.invoke_primitive(:pointer_find_type_size, :short)
   SIZEOF_INT        = Truffle::FiddleBackend::SIZEOF_INT
   SIZEOF_LONG       = Truffle::FiddleBackend::SIZEOF_LONG
-  SIZEOF_LONG_LONG  = Truffle::FFI::Pointer.find_type_size(:long_long)
-  SIZEOF_FLOAT      = Truffle::FFI::Pointer.find_type_size(:float)
-  SIZEOF_DOUBLE     = Truffle::FFI::Pointer.find_type_size(:double)
-
-  SIZEOF_SIZE_T     = Truffle::FFI::Pointer.find_type_size(:size_t)
-  SIZEOF_SSIZE_T    = Truffle::FFI::Pointer.find_type_size(:ssize_t)
-  SIZEOF_PTRDIFF_T  = Truffle::FFI::Pointer.find_type_size(:ptrdiff_t)
-  SIZEOF_INTPTR_T   = Truffle::FFI::Pointer.find_type_size(:intptr_t)
-  SIZEOF_UINTPTR_T  = Truffle::FFI::Pointer.find_type_size(:uintptr_t)
+  SIZEOF_LONG_LONG  = Truffle.invoke_primitive(:pointer_find_type_size, :long_long)
+  SIZEOF_FLOAT      = Truffle.invoke_primitive(:pointer_find_type_size, :float)
+  SIZEOF_DOUBLE     = Truffle.invoke_primitive(:pointer_find_type_size, :double)
+
+  SIZEOF_SIZE_T     = Truffle.invoke_primitive(:pointer_find_type_size, :size_t)
+  SIZEOF_SSIZE_T    = Truffle.invoke_primitive(:pointer_find_type_size, :ssize_t)
+  SIZEOF_PTRDIFF_T  = Truffle.invoke_primitive(:pointer_find_type_size, :ptrdiff_t)
+  SIZEOF_INTPTR_T   = Truffle.invoke_primitive(:pointer_find_type_size, :intptr_t)
+  SIZEOF_UINTPTR_T  = Truffle.invoke_primitive(:pointer_find_type_size, :uintptr_t)
 
   TYPE_SSIZE_T      = Truffle::FiddleBackend.int_type(SIZEOF_SIZE_T)
   TYPE_SIZE_T       = -1 * Truffle::FiddleBackend::SIGNEDNESS_OF_SIZE_T * TYPE_SSIZE_T

spec/tags/truffle/fiddle_tags.txt

@@ -0,0 +1 @@
+slow:Fiddle can be loaded after the FFI

spec/truffle/fiddle_spec.rb

@@ -0,0 +1,15 @@
+# Copyright (c) 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:
+#
+# Eclipse Public License version 1.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+require_relative '../ruby/spec_helper'
+
+describe "Fiddle" do
+  it "can be loaded after the FFI" do
+    ruby_exe("require 'ffi'; require 'fiddle'; puts 14", args: "2>&1").should == "14\n"
+  end
+end

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

@@ -48,7 +48,7 @@ class Pointer < AbstractMemory
 
     # NOTE: redefined in lib/truffle/ffi.rb for full FFI
     def self.find_type_size(type)
-      Truffle.invoke_primitive :pointer_find_type_size, type
+      Truffle.invoke_primitive(:pointer_find_type_size, type)
     end
 
     def self.size