more on struct rb_call_data

Replacing adjacent struct rb_call_info and struct rb_call_cache
into a struct rb_call_data.

1 files changed, 1 insertions, 13 deletions

diff --git a/vm_core.h b/vm_core.h
index 5c8c91b593..53d4217847 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -234,13 +234,6 @@ union iseq_inline_storage_entry {
     struct iseq_inline_cache_entry cache;
 };
 
-struct rb_call_info {
-    /* fixed at compile time */
-    ID mid;
-    unsigned int flag;
-    int orig_argc;
-};
-
 struct rb_call_info_kw_arg {
     int keyword_len;
     VALUE keywords[1];
@@ -258,18 +251,13 @@ struct rb_calling_info {
     int kw_splat;
 };
 
-struct rb_call_data {
-    struct rb_call_cache cc;
-    struct rb_call_info ci;
-};
-
 struct rb_kwarg_call_data {
     struct rb_call_cache cc;
     struct rb_call_info_with_kwarg ci_kw;
 };
 
 struct rb_execution_context_struct;
-typedef VALUE (*vm_call_handler)(struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc);
+typedef VALUE (*vm_call_handler)(struct rb_execution_context_struct *ec, struct rb_control_frame_struct *cfp, struct rb_calling_info *calling, struct rb_call_data *cd);
 
 #if 1
 #define CoreDataFromValue(obj, type) (type*)DATA_PTR(obj)