[PATCH v3 8/8] jscript: Store ref to the function code instead of the function instance in arguments obj.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

We don't need the function instance anymore, and this simplifies the
traversal and removes possible cyclic refs with it.

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/jscript/function.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 35aee1bb5a9..f8f3c56aa21 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -65,7 +65,7 @@ typedef struct {

typedef struct {
     jsdisp_t jsdisp;
-    InterpretedFunction *function;
+    function_code_t *func_code;
     call_frame_t *frame;
     unsigned argc;
     jsval_t buf[];
@@ -111,8 +111,7 @@ static void Arguments_destructor(jsdisp_t *jsdisp)
     for(i = 0; i < arguments->argc; i++)
         jsval_release(arguments->buf[i]);

-    if(arguments->function)
-        jsdisp_release(&arguments->function->function.dispex);
+    release_bytecode(arguments->func_code->bytecode);
     free(arguments);
 }

@@ -168,7 +167,7 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op
             return hres;
     }

-    return gc_process_linked_obj(gc_ctx, op, jsdisp, &arguments->function->function.dispex, (void**)&arguments->function);
+    return S_OK;
 }

static const builtin_info_t Arguments_info = {
@@ -199,7 +198,8 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame)
         return hres;
     }

-    args->function = (InterpretedFunction*)function_from_jsdisp(jsdisp_addref(frame->function_instance));
+    args->func_code = ((InterpretedFunction*)function_from_jsdisp(frame->function_instance))->func_code;
+    bytecode_addref(args->func_code->bytecode);
     args->argc = frame->argc;
     args->frame = frame;
     for(i = 0; i < args->argc; i++)
@@ -209,7 +209,7 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame)
                                        jsval_number(args->argc));
     if(SUCCEEDED(hres))
         hres = jsdisp_define_data_property(&args->jsdisp, L"callee", PROPF_WRITABLE | PROPF_CONFIGURABLE,
-                                           jsval_obj(&args->function->function.dispex));
+                                           jsval_obj(frame->function_instance));
     if(SUCCEEDED(hres))
         hres = jsdisp_propput(as_jsdisp(frame->base_scope->obj), L"arguments", PROPF_WRITABLE, TRUE, jsval_obj(&args->jsdisp));
     if(FAILED(hres)) {
@@ -282,7 +282,7 @@ HRESULT get_arguments_identifier_id(jsdisp_t *args_disp, const WCHAR *identifier
     local_ref_t *ref;
     WCHAR buf[11];

-    ref = lookup_local(arguments->function->func_code, identifier, 0);
+    ref = lookup_local(arguments->func_code, identifier, 0);

if(!ref || ref->ref >= 0 || -ref->ref - 1 >= arguments->argc)
         return DISP_E_MEMBERNOTFOUND;