[PATCH v3 7/8] jscript: Don't allocate arguments buffer separately from the arguments obj.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

We are using it unconditionally now anyway.

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

diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 8675fc53529..35aee1bb5a9 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -66,9 +66,9 @@ typedef struct {
 typedef struct {
     jsdisp_t jsdisp;
     InterpretedFunction *function;
-    jsval_t *buf;
     call_frame_t *frame;
     unsigned argc;
+    jsval_t buf[];
 } ArgumentsInstance;

static HRESULT create_bind_function(script_ctx_t*,FunctionInstance*,jsval_t,unsigned,jsval_t*,jsdisp_t**r);
@@ -104,15 +104,12 @@ static HRESULT Arguments_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns
 static void Arguments_destructor(jsdisp_t *jsdisp)
 {
     ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp);
+    unsigned i;

TRACE("(%p)\n", arguments);

-    if(arguments->buf) {
-        unsigned i;
-        for(i = 0; i < arguments->argc; i++)
-            jsval_release(arguments->buf[i]);
-        free(arguments->buf);
-    }
+    for(i = 0; i < arguments->argc; i++)
+        jsval_release(arguments->buf[i]);

if(arguments->function)
         jsdisp_release(&arguments->function->function.dispex);
@@ -165,12 +162,10 @@ static HRESULT Arguments_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op
     HRESULT hres;
     unsigned i;

-    if(arguments->buf) {
-        for(i = 0; i < arguments->argc; i++) {
-            hres = gc_process_linked_val(gc_ctx, op, jsdisp, &arguments->buf[i]);
-            if(FAILED(hres))
-                return hres;
-        }
+    for(i = 0; i < arguments->argc; i++) {
+        hres = gc_process_linked_val(gc_ctx, op, jsdisp, &arguments->buf[i]);
+        if(FAILED(hres))
+            return hres;
     }

return gc_process_linked_obj(gc_ctx, op, jsdisp, &arguments->function->function.dispex, (void**)&arguments->function);
@@ -194,19 +189,12 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame)
     HRESULT hres;
     unsigned i;

-    args = calloc(1, sizeof(*args));
+    args = calloc(1, FIELD_OFFSET(ArgumentsInstance, buf[frame->argc]));
     if(!args)
         return E_OUTOFMEMORY;

-    args->buf = malloc(frame->argc * sizeof(*args->buf));
-    if(!args->buf) {
-        free(args);
-        return E_OUTOFMEMORY;
-    }
-
     hres = init_dispex_from_constr(&args->jsdisp, ctx, &Arguments_info, ctx->object_constr);
     if(FAILED(hres)) {
-        free(args->buf);
         free(args);
         return hres;
     }