Fix get_variable_value invocation in opfunc_call_n.

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected]

Author: ruben-ayrapetyan

jerry-core/vm/opcodes.cpp

@@ -39,6 +39,10 @@
  *         The operator should return from the opcode handler with it's 'return value'.
  *
  *      5. No other operations with opcode handler's 'return value' variable should be performed.
+ *
+ * Note:
+ *      get_variable_value, taking an idx should be called with instruction counter value,
+ *      corresponding to the instruction, containing the idx argument.
  */
 
 #define OP_UNIMPLEMENTED_LIST(op) \
@@ -690,6 +694,72 @@ opfunc_func_expr_n (opcode_t opdata, /**< operation data */
   return ret_value;
 } /* opfunc_func_expr_n */
 
+/**
+ * Get 'this' argument value and call flags mask for function call
+ *
+ * See also:
+ *          ECMA-262 v5, 11.2.3, steps 6-7
+
+ * @return ecma-value
+ *         Returned value must be freed with ecma_free_value
+ */
+static ecma_value_t
+vm_helper_call_get_call_flags_and_this_arg (int_data_t *int_data_p, /**< interpreter context */
+                                            opcode_call_flags_t *out_flags_p) /**< out: call flags */
+{
+  JERRY_ASSERT (out_flags_p != NULL);
+
+  bool is_increase_instruction_pointer;
+
+  opcode_call_flags_t call_flags = OPCODE_CALL_FLAGS__EMPTY;
+  idx_t this_arg_var_idx = INVALID_VALUE;
+
+  opcode_t next_opcode = vm_get_opcode (int_data_p->opcodes_p, int_data_p->pos);
+  if (next_opcode.op_idx == __op__idx_meta
+      && next_opcode.data.meta.type == OPCODE_META_TYPE_CALL_SITE_INFO)
+  {
+    call_flags = (opcode_call_flags_t) next_opcode.data.meta.data_1;
+
+    if (call_flags & OPCODE_CALL_FLAGS_HAVE_THIS_ARG)
+    {
+      this_arg_var_idx = next_opcode.data.meta.data_2;
+      JERRY_ASSERT (is_reg_variable (int_data_p, this_arg_var_idx));
+
+      JERRY_ASSERT ((call_flags & OPCODE_CALL_FLAGS_DIRECT_CALL_TO_EVAL_FORM) == 0);
+    }
+
+    is_increase_instruction_pointer = true;
+  }
+  else
+  {
+    is_increase_instruction_pointer = false;
+  }
+
+  ecma_completion_value_t get_this_completion_value;
+  ecma_value_t this_value;
+
+  if (call_flags & OPCODE_CALL_FLAGS_HAVE_THIS_ARG)
+  {
+    get_this_completion_value = get_variable_value (int_data_p, this_arg_var_idx, false);
+  }
+  else
+  {
+    get_this_completion_value = ecma_op_implicit_this_value (int_data_p->lex_env_p);
+  }
+  JERRY_ASSERT (ecma_is_completion_value_normal (get_this_completion_value));
+
+  this_value = ecma_get_completion_value_value (get_this_completion_value);
+
+  if (is_increase_instruction_pointer)
+  {
+    int_data_p->pos++;
+  }
+
+  *out_flags_p = call_flags;
+
+  return this_value;
+} /* vm_helper_call_get_call_flags_and_this_arg */
+
 /**
  * 'Function call' opcode handler.
  *
@@ -713,28 +783,10 @@ opfunc_call_n (opcode_t opdata, /**< operation data */
 
   int_data->pos++;
 
-  idx_t this_arg_var_idx = INVALID_VALUE;
-
-  opcode_call_flags_t call_flags = OPCODE_CALL_FLAGS__EMPTY;
-
   JERRY_ASSERT (!int_data->is_call_in_direct_eval_form);
 
-  opcode_t next_opcode = vm_get_opcode (int_data->opcodes_p, int_data->pos);
-  if (next_opcode.op_idx == __op__idx_meta
-      && next_opcode.data.meta.type == OPCODE_META_TYPE_CALL_SITE_INFO)
-  {
-    call_flags = (opcode_call_flags_t) next_opcode.data.meta.data_1;
-
-    if (call_flags & OPCODE_CALL_FLAGS_HAVE_THIS_ARG)
-    {
-      this_arg_var_idx = next_opcode.data.meta.data_2;
-      JERRY_ASSERT (is_reg_variable (int_data, this_arg_var_idx));
-
-      JERRY_ASSERT ((call_flags & OPCODE_CALL_FLAGS_DIRECT_CALL_TO_EVAL_FORM) == 0);
-    }
-
-    int_data->pos++;
-  }
+  opcode_call_flags_t call_flags;
+  ecma_value_t this_value = vm_helper_call_get_call_flags_and_this_arg (int_data, &call_flags);
 
   MEM_DEFINE_LOCAL_ARRAY (arg_values, args_number_idx, ecma_value_t);
 
@@ -748,20 +800,6 @@ opfunc_call_n (opcode_t opdata, /**< operation data */
   {
     JERRY_ASSERT (args_read == args_number_idx);
 
-    ecma_completion_value_t get_this_completion_value;
-
-    if (call_flags & OPCODE_CALL_FLAGS_HAVE_THIS_ARG)
-    {
-      get_this_completion_value = get_variable_value (int_data, this_arg_var_idx, false);
-    }
-    else
-    {
-      get_this_completion_value = ecma_op_implicit_this_value (int_data->lex_env_p);
-    }
-    JERRY_ASSERT (ecma_is_completion_value_normal (get_this_completion_value));
-
-    ecma_value_t this_value = ecma_get_completion_value_value (get_this_completion_value);
-
     if (!ecma_op_is_callable (func_value))
     {
       ret_value = ecma_make_throw_obj_completion_value (ecma_new_standard_error (ECMA_ERROR_TYPE));
@@ -798,8 +836,6 @@ opfunc_call_n (opcode_t opdata, /**< operation data */
         JERRY_ASSERT (!int_data->is_call_in_direct_eval_form);
       }
     }
-
-    ecma_free_completion_value (get_this_completion_value);
   }
   else
   {
@@ -817,6 +853,8 @@ opfunc_call_n (opcode_t opdata, /**< operation data */
 
   MEM_FINALIZE_LOCAL_ARRAY (arg_values);
 
+  ecma_free_value (this_value, true);
+
   ECMA_FINALIZE (func_value);
 
   return ret_value;