dont add data$ get struct call when no_gil used for c functions in attached classes

Author: v0dro

lib/rubex/ast/expression/method_call/c_function_call.rb

@@ -5,13 +5,8 @@ class CFunctionCall < MethodCall
         def analyse_types(local_scope)
           @entry = local_scope.find(@method_name)
           super
-          append_self_argument unless @entry.extern?
+          append_self_argument if  !@entry.extern? && !@entry.no_gil
           @type = @entry.type.base_type
-          #puts @method_name
-          if @method_name == "bar"
-            #binding.pry
-          end
-          #@arg_list.analyse_types local_scope
           @arg_list.analyse_for_target_type @type.arg_list, local_scope
           @arg_list.allocate_temps local_scope
           @arg_list.release_temps local_scope
@@ -31,9 +26,7 @@ def c_code(local_scope)
         private
 
         def append_self_argument
-          if !@entry.no_gil
-            @arg_list << Expression::Self.new
-          end
+          @arg_list << Expression::Self.new
         end
 
         def code_for_c_method_call(local_scope)

lib/rubex/ast/top_statement/klass/attached_klass.rb

@@ -17,13 +17,13 @@ def initialize(name, attached_type, ancestor, statements, location)
 
         def analyse_statement(outer_scope)
           super(outer_scope, attach_klass: true)
-          prepare_data_holding_struct
+          prepare_data_holding_struct!
           prepare_rb_data_type_t_struct
           detach_and_modify_auxillary_c_functions_from_statements
           add_auxillary_functions_to_klass_scope
           prepare_auxillary_c_functions
           @statements[1..-1].each do |stmt| # 0th stmt is the data struct
-            if ruby_method_or_c_func?(stmt)
+            if ruby_method_or_c_func_without_gil_lock?(stmt)
               rewrite_method_with_data_fetching stmt
             end
             stmt.analyse_statement @scope
@@ -198,7 +198,7 @@ def write_data_type_t_struct(code)
 
         # Prepare the data holding struct 'data' that will hold a pointer to the
         #   struct that is attached to this class.
-        def prepare_data_holding_struct
+        def prepare_data_holding_struct!
           struct_name = @name + '_data_struct'
           declarations = declarations_for_data_struct
           @data_struct = Statement::CStructOrUnionDef.new(
@@ -230,8 +230,8 @@ def prepare_auxillary_c_functions
           prepare_get_struct_c_function
         end
 
-        def ruby_method_or_c_func?(stmt)
-          stmt.is_a?(RubyMethodDef) || stmt.is_a?(CFunctionDef)
+        def ruby_method_or_c_func_without_gil_lock?(stmt)
+          stmt.is_a?(RubyMethodDef) || (stmt.is_a?(CFunctionDef) && !stmt.no_gil)
         end
 
         # Rewrite method `stmt` so that the `data` variable becomes available

lib/rubex/ast/top_statement/method_def/c_function_def.rb

@@ -2,20 +2,22 @@ module Rubex
   module AST
     module TopStatement
       class CFunctionDef < MethodDef
-        attr_reader :type, :return_ptr_level
+        attr_reader :type, :return_ptr_level, :no_gil
 
         def initialize(type, return_ptr_level, name, arg_list, function_tags, statements)
           super(name, arg_list, statements)
           @type = type
           @return_ptr_level = return_ptr_level
           @function_tags = function_tags
+          @no_gil = false
+          if @function_tags == "no_gil"
+            @no_gil = true
+          end
         end
 
         def analyse_statement(outer_scope, extern: false)
           super(outer_scope)
-          if @function_tags == "no_gil"
-            @entry.no_gil = true
-          end
+          @entry.no_gil = @no_gil
         end
 
         def generate_code(code)

spec/binding_ptr_args_spec.rb

@@ -20,7 +20,7 @@
       end
     end
 
-    context "Black Box testing" do
+    context "Black Box testing", hell: true do
       it "compiles and checks for valid output" do
         setup_and_teardown_compiled_files(test_case) do |dir|
           require_relative "#{dir}/#{test_case}.#{os_extension}"

spec/c_function_ptrs_spec.rb

@@ -21,15 +21,15 @@
       end
     end
 
-    context "Black Box testing", hell: true do
+    context "Black Box testing" do
       it "compiles and checks for valid output" do
         setup_and_teardown_compiled_files(test_case) do |dir|
           require_relative "#{dir}/#{test_case}.#{os_extension}"
 
           cls = CFunctionPtrs.new
 
-          # expect(cls.test_c_function_pointers(true)) .to eq(5)
-          # expect(cls.test_c_function_pointers(false)).to eq(7)
+          expect(cls.test_c_function_pointers(true)) .to eq(5)
+          expect(cls.test_c_function_pointers(false)).to eq(7)
           expect(cls.test_pass_by_name).to eq(17)
         end
       end

spec/fixtures/no_gil/no_gil.rubex

@@ -1,3 +1,5 @@
+lib "rubex/ruby"; end
+
 cfunc void _work_without_gil(double n) no_gil
   while n > 0 do
     n ** 0.5 + 4
@@ -20,3 +22,21 @@ def work_with_gil(double n)
     n -= 1
   end
 end
+
+struct test
+  int a
+end
+
+class A attach test
+  cfunc void __bar no_gil
+    int b
+  end
+  
+  def foo
+    __bar
+  end
+
+  cfunc void deallocate
+    xfree(data$.test)
+  end
+end

spec/no_gil_spec.rb

@@ -20,7 +20,7 @@
       end
     end
 
-    context "Black Box testing" do
+    context "Black Box testing", hell: true do
       it "compiles and checks for valid output" do
         setup_and_teardown_compiled_files(test_case) do |dir|
           require_relative "#{dir}/#{test_case}.#{os_extension}"