From b7d591643ae37a556217a22e1ee9e9c6ab7cfd3e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 14 Nov 2022 13:16:26 -0800 Subject: [PATCH] Remove USE_RVARGC code We don't need this constant to be exposed anymore, so remove it --- lib/mjit/compiler.rb | 1 - mjit_c.rb | 4 ---- tool/mjit/bindgen.rb | 1 - yjit/bindgen/src/main.rs | 3 --- yjit/src/cruby_bindings.inc.rs | 1 - 5 files changed, 10 deletions(-) diff --git a/lib/mjit/compiler.rb b/lib/mjit/compiler.rb index db8327b863..3ccdc1c925 100644 --- a/lib/mjit/compiler.rb +++ b/lib/mjit/compiler.rb @@ -1,5 +1,4 @@ module RubyVM::MJIT - USE_RVARGC = C.USE_RVARGC ROBJECT_EMBED_LEN_MAX = C.ROBJECT_EMBED_LEN_MAX UNSUPPORTED_INSNS = [ diff --git a/mjit_c.rb b/mjit_c.rb index 16c73fc220..322a8f15cf 100644 --- a/mjit_c.rb +++ b/mjit_c.rb @@ -134,10 +134,6 @@ module RubyVM::MJIT Primitive.cexpr! %q{ RBOOL(USE_LAZY_LOAD != 0) } end - def C.USE_RVARGC - Primitive.cexpr! %q{ RBOOL(USE_RVARGC != 0) } - end - def C.NOT_COMPILED_STACK_SIZE Primitive.cexpr! %q{ INT2NUM(NOT_COMPILED_STACK_SIZE) } end diff --git a/tool/mjit/bindgen.rb b/tool/mjit/bindgen.rb index 64ac3eb7d2..5ffe7166bc 100755 --- a/tool/mjit/bindgen.rb +++ b/tool/mjit/bindgen.rb @@ -329,7 +329,6 @@ generator = BindingGenerator.new( src_path: src_path, uses: %w[ USE_LAZY_LOAD - USE_RVARGC ], values: { INT: %w[ diff --git a/yjit/bindgen/src/main.rs b/yjit/bindgen/src/main.rs index acbbaa613b..2b94d95608 100644 --- a/yjit/bindgen/src/main.rs +++ b/yjit/bindgen/src/main.rs @@ -63,9 +63,6 @@ fn main() { // Import YARV bytecode instruction constants .allowlist_type("ruby_vminsn_type") - // From include/ruby/internal/config.h - .allowlist_var("USE_RVARGC") - // From include/ruby/internal/special_consts.h .allowlist_type("ruby_special_consts") diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index d6218385b0..17e5a84c3c 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -123,7 +123,6 @@ impl ::std::cmp::PartialEq for __BindgenUnionField { } } impl ::std::cmp::Eq for __BindgenUnionField {} -pub const USE_RVARGC: u32 = 1; pub const INTEGER_REDEFINED_OP_FLAG: u32 = 1; pub const FLOAT_REDEFINED_OP_FLAG: u32 = 2; pub const STRING_REDEFINED_OP_FLAG: u32 = 4;