summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Stauner <randy@r4s6.net>2025-11-10 21:10:10 -0700
committerGitHub <noreply@github.com>2025-11-10 20:10:10 -0800
commit71fecfa205f5ee2423f78877cca3a60bd07cbfd8 (patch)
tree202919a234bf3893d1c8e3d22907be92d74ccf92
parentd9f0b5a5f91b03ab5043029b4ae19847e965aa1a (diff)
ZJIT: Rename things so that they aren't named "not_optimized_optimized" (#15135)
These refer to "OptimizedMethodType" which is a subcategory of "MethodType::Optimized" so name them after the latter to avoid "not_optimized_optimized".
-rw-r--r--zjit/src/codegen.rs2
-rw-r--r--zjit/src/hir.rs4
-rw-r--r--zjit/src/stats.rs6
3 files changed, 6 insertions, 6 deletions
diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs
index f27e61831b..0a19035dc1 100644
--- a/zjit/src/codegen.rs
+++ b/zjit/src/codegen.rs
@@ -1835,7 +1835,7 @@ fn gen_incr_send_fallback_counter(asm: &mut Assembler, reason: SendFallbackReaso
SendWithoutBlockNotOptimizedMethodType(method_type) => {
gen_incr_counter(asm, send_without_block_fallback_counter_for_method_type(method_type));
}
- SendWithoutBlockNotOptimizedOptimizedMethodType(method_type) => {
+ SendWithoutBlockNotOptimizedMethodTypeOptimized(method_type) => {
gen_incr_counter(asm, send_without_block_fallback_counter_for_optimized_method_type(method_type));
}
SendNotOptimizedMethodType(method_type) => {
diff --git a/zjit/src/hir.rs b/zjit/src/hir.rs
index b27ccd1345..9b4495c6e6 100644
--- a/zjit/src/hir.rs
+++ b/zjit/src/hir.rs
@@ -592,7 +592,7 @@ pub enum SendFallbackReason {
SendWithoutBlockCfuncNotVariadic,
SendWithoutBlockCfuncArrayVariadic,
SendWithoutBlockNotOptimizedMethodType(MethodType),
- SendWithoutBlockNotOptimizedOptimizedMethodType(OptimizedMethodType),
+ SendWithoutBlockNotOptimizedMethodTypeOptimized(OptimizedMethodType),
SendWithoutBlockDirectTooManyArgs,
SendPolymorphic,
SendMegamorphic,
@@ -2534,7 +2534,7 @@ impl Function {
};
self.make_equal_to(insn_id, replacement);
} else {
- self.set_dynamic_send_reason(insn_id, SendWithoutBlockNotOptimizedOptimizedMethodType(OptimizedMethodType::from(opt_type)));
+ self.set_dynamic_send_reason(insn_id, SendWithoutBlockNotOptimizedMethodTypeOptimized(OptimizedMethodType::from(opt_type)));
self.push_insn_id(block, insn_id); continue;
}
} else {
diff --git a/zjit/src/stats.rs b/zjit/src/stats.rs
index ec52662086..6fd0ac7bb0 100644
--- a/zjit/src/stats.rs
+++ b/zjit/src/stats.rs
@@ -178,7 +178,7 @@ make_counters! {
send_fallback_send_without_block_cfunc_not_variadic,
send_fallback_send_without_block_cfunc_array_variadic,
send_fallback_send_without_block_not_optimized_method_type,
- send_fallback_send_without_block_not_optimized_optimized_method_type,
+ send_fallback_send_without_block_not_optimized_method_type_optimized,
send_fallback_send_without_block_direct_too_many_args,
send_fallback_send_polymorphic,
send_fallback_send_megamorphic,
@@ -471,8 +471,8 @@ pub fn send_fallback_counter(reason: crate::hir::SendFallbackReason) -> Counter
SendWithoutBlockCfuncNotVariadic => send_fallback_send_without_block_cfunc_not_variadic,
SendWithoutBlockCfuncArrayVariadic => send_fallback_send_without_block_cfunc_array_variadic,
SendWithoutBlockNotOptimizedMethodType(_) => send_fallback_send_without_block_not_optimized_method_type,
- SendWithoutBlockNotOptimizedOptimizedMethodType(_)
- => send_fallback_send_without_block_not_optimized_optimized_method_type,
+ SendWithoutBlockNotOptimizedMethodTypeOptimized(_)
+ => send_fallback_send_without_block_not_optimized_method_type_optimized,
SendWithoutBlockDirectTooManyArgs => send_fallback_send_without_block_direct_too_many_args,
SendPolymorphic => send_fallback_send_polymorphic,
SendMegamorphic => send_fallback_send_megamorphic,