From c6bea54c70ca4deabba1b028b1dd0dbdc7c0680c Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sat, 11 Mar 2023 20:41:24 -0800 Subject: [PATCH] RJIT: Drop unused USE_* macros support --- rjit_c.rb | 4 ---- tool/rjit/bindgen.rb | 15 +-------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/rjit_c.rb b/rjit_c.rb index 3aeda8b3b4..e162d58ffa 100644 --- a/rjit_c.rb +++ b/rjit_c.rb @@ -502,10 +502,6 @@ module RubyVM::RJIT # :nodoc: all ### RJIT bindgen begin ### - def C.USE_LAZY_LOAD - Primitive.cexpr! %q{ RBOOL(USE_LAZY_LOAD != 0) } - end - def C.VM_ENV_DATA_INDEX_ME_CREF Primitive.cexpr! %q{ INT2NUM(VM_ENV_DATA_INDEX_ME_CREF) } end diff --git a/tool/rjit/bindgen.rb b/tool/rjit/bindgen.rb index 27fda7926b..f3504a9958 100755 --- a/tool/rjit/bindgen.rb +++ b/tool/rjit/bindgen.rb @@ -106,16 +106,14 @@ class BindingGenerator attr_reader :src # @param src_path [String] - # @param uses [Array] # @param values [Hash{ Symbol => Array }] # @param types [Array] # @param dynamic_types [Array] #ifdef-dependent immediate types, which need Primitive.cexpr! for type detection # @param skip_fields [Hash{ Symbol => Array }] Struct fields that are skipped from bindgen # @param ruby_fields [Hash{ Symbol => Array }] Struct VALUE fields that are considered Ruby objects - def initialize(src_path:, uses:, values:, types:, dynamic_types:, skip_fields:, ruby_fields:) + def initialize(src_path:, values:, types:, dynamic_types:, skip_fields:, ruby_fields:) @preamble, @postamble = split_ambles(src_path) @src = String.new - @uses = uses.sort @values = values.transform_values(&:sort) @types = types.sort @dynamic_types = dynamic_types.sort @@ -127,14 +125,6 @@ class BindingGenerator def generate(nodes) println @preamble - # Define USE_* macros - @uses.each do |use| - println " def C.#{use}" - println " Primitive.cexpr! %q{ RBOOL(#{use} != 0) }" - println " end" - println - end - # Define macros/enums @values.each do |type, values| values.each do |value| @@ -352,9 +342,6 @@ end nodes = HeaderParser.new(File.join(src_dir, 'rjit_c.h'), cflags: cflags).parse generator = BindingGenerator.new( src_path: src_path, - uses: %w[ - USE_LAZY_LOAD - ], values: { INT: %w[ VM_ENV_DATA_INDEX_SPECVAL