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".

Author: rwstauner

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) => {

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 {

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,