Optimize add operation.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com

jerry-core/vm/opcodes-ecma-arithmetics.c

@@ -18,6 +18,7 @@
 #include "ecma-conversion.h"
 #include "ecma-helpers.h"
 #include "ecma-number-arithmetic.h"
+#include "ecma-objects.h"
 #include "ecma-try-catch-macro.h"
 #include "opcodes.h"
 #include "jrt-libc-includes.h"
@@ -59,12 +60,6 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation
   {
     switch (op)
     {
-      case NUMBER_ARITHMETIC_ADDITION:
-      {
-        ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
-        ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
-        return ecma_make_int32_value ((int32_t) (left_integer + right_integer));
-      }
       case NUMBER_ARITHMETIC_SUBSTRACTION:
       {
         ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
@@ -117,11 +112,6 @@ do_number_arithmetic (number_arithmetic_op op, /**< number arithmetic operation
 
   switch (op)
   {
-    case NUMBER_ARITHMETIC_ADDITION:
-    {
-      result = ecma_number_add (num_left, num_right);
-      break;
-    }
     case NUMBER_ARITHMETIC_SUBSTRACTION:
     {
       result = ecma_number_substract (num_left, num_right);
@@ -164,22 +154,58 @@ ecma_value_t
 opfunc_addition (ecma_value_t left_value, /**< left value */
                  ecma_value_t right_value) /**< right value */
 {
+  if (ecma_are_values_integer_numbers (left_value, right_value))
+  {
+    ecma_integer_value_t left_integer = ecma_get_integer_from_value (left_value);
+    ecma_integer_value_t right_integer = ecma_get_integer_from_value (right_value);
+    return ecma_make_int32_value ((int32_t) (left_integer + right_integer));
+  }
+
+  if (ecma_is_value_number (left_value) && ecma_is_value_number (right_value))
+  {
+    ecma_number_t num_left = ecma_get_number_from_value (left_value);
+    ecma_number_t num_right = ecma_get_number_from_value (right_value);
+    return ecma_make_number_value (ecma_number_add (num_left, num_right));
+  }
+
+  bool free_left_value = false;
+  bool free_right_value = false;
+
+  if (ecma_is_value_object (left_value))
+  {
+    ecma_object_t *obj_p = ecma_get_object_from_value (left_value);
+    left_value = ecma_op_object_default_value (obj_p, ECMA_PREFERRED_TYPE_NO);
+    free_left_value = true;
+
+    if (ecma_is_value_error (left_value))
+    {
+      return left_value;
+    }
+  }
+
+  if (ecma_is_value_object (right_value))
+  {
+    ecma_object_t *obj_p = ecma_get_object_from_value (right_value);
+    right_value = ecma_op_object_default_value (obj_p, ECMA_PREFERRED_TYPE_NO);
+    free_right_value = true;
+
+    if (ecma_is_value_error (right_value))
+    {
+      if (free_left_value)
+      {
+        ecma_free_value (left_value);
+      }
+      return right_value;
+    }
+  }
+
   ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
 
-  ECMA_TRY_CATCH (prim_left_value,
+  if (ecma_is_value_string (left_value)
-                  ecma_op_to_primitive (left_value,
+      || ecma_is_value_string (right_value))
-                                        ECMA_PREFERRED_TYPE_NO),
-                  ret_value);
-  ECMA_TRY_CATCH (prim_right_value,
-                  ecma_op_to_primitive (right_value,
-                                        ECMA_PREFERRED_TYPE_NO),
-                  ret_value);
-
-  if (ecma_is_value_string (prim_left_value)
-      || ecma_is_value_string (prim_right_value))
   {
-    ECMA_TRY_CATCH (str_left_value, ecma_op_to_string (prim_left_value), ret_value);
+    ECMA_TRY_CATCH (str_left_value, ecma_op_to_string (left_value), ret_value);
-    ECMA_TRY_CATCH (str_right_value, ecma_op_to_string (prim_right_value), ret_value);
+    ECMA_TRY_CATCH (str_right_value, ecma_op_to_string (right_value), ret_value);
 
     ecma_string_t *string1_p = ecma_get_string_from_value (str_left_value);
     ecma_string_t *string2_p = ecma_get_string_from_value (str_right_value);
@@ -193,13 +219,24 @@ opfunc_addition (ecma_value_t left_value, /**< left value */
   }
   else
   {
-    ret_value = do_number_arithmetic (NUMBER_ARITHMETIC_ADDITION,
+    ECMA_OP_TO_NUMBER_TRY_CATCH (num_left, left_value, ret_value);
-                                      left_value,
+    ECMA_OP_TO_NUMBER_TRY_CATCH (num_right, right_value, ret_value);
-                                      right_value);
+
+    ret_value = ecma_make_number_value (ecma_number_add (num_left, num_right));
+
+    ECMA_OP_TO_NUMBER_FINALIZE (num_right);
+    ECMA_OP_TO_NUMBER_FINALIZE (num_left);
   }
 
-  ECMA_FINALIZE (prim_right_value);
+  if (free_left_value)
-  ECMA_FINALIZE (prim_left_value);
+  {
+    ecma_free_value (left_value);
+  }
+
+  if (free_right_value)
+  {
+    ecma_free_value (right_value);
+  }
 
   return ret_value;
 } /* opfunc_addition */

jerry-core/vm/opcodes.h

@@ -32,7 +32,6 @@
  */
 typedef enum
 {
-  NUMBER_ARITHMETIC_ADDITION, /**< addition */
   NUMBER_ARITHMETIC_SUBSTRACTION, /**< substraction */
   NUMBER_ARITHMETIC_MULTIPLICATION, /**< multiplication */
   NUMBER_ARITHMETIC_DIVISION, /**< division */