Remove several ecma_op_object_get_[own_]property calls.

The ecma_op_object_get_[own_]property calls should be phased out from the project eventually and virtual properties should be introduced instead. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
2016-09-08 23:38:45 -07:00
parent 7f80b76009
commit da02a37a02
22 changed files with 479 additions and 463 deletions
@@ -582,18 +582,18 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
    // 3.
    ecma_string_t *enumerable_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_ENUMERABLE);

-    if (ecma_op_object_get_property (obj_p, enumerable_magic_string_p) != NULL)
-    {
-      ECMA_TRY_CATCH (enumerable_prop_value,
-                      ecma_op_object_get (obj_p, enumerable_magic_string_p),
-                      ret_value);
+    ECMA_TRY_CATCH (enumerable_prop_value,
+                    ecma_op_object_find (obj_p, enumerable_magic_string_p),
+                    ret_value);

+    if (ecma_is_value_found (enumerable_prop_value))
+    {
      prop_desc.is_enumerable_defined = true;
      prop_desc.is_enumerable = ecma_op_to_boolean (enumerable_prop_value);
-
-      ECMA_FINALIZE (enumerable_prop_value);
    }

+    ECMA_FINALIZE (enumerable_prop_value);
+
    ecma_deref_ecma_string (enumerable_magic_string_p);

    if (!ECMA_IS_VALUE_ERROR (ret_value))
@@ -603,18 +603,18 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
      // 4.
      ecma_string_t *configurable_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_CONFIGURABLE);

-      if (ecma_op_object_get_property (obj_p, configurable_magic_string_p) != NULL)
-      {
-        ECMA_TRY_CATCH (configurable_prop_value,
-                        ecma_op_object_get (obj_p, configurable_magic_string_p),
-                        ret_value);
+      ECMA_TRY_CATCH (configurable_prop_value,
+                      ecma_op_object_find (obj_p, configurable_magic_string_p),
+                      ret_value);

+      if (ecma_is_value_found (configurable_prop_value))
+      {
        prop_desc.is_configurable_defined = true;
        prop_desc.is_configurable = ecma_op_to_boolean (configurable_prop_value);
-
-        ECMA_FINALIZE (configurable_prop_value);
      }

+      ECMA_FINALIZE (configurable_prop_value);
+
      ecma_deref_ecma_string (configurable_magic_string_p);
    }

@@ -625,18 +625,18 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
      // 5.
      ecma_string_t *value_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_VALUE);

-      if (ecma_op_object_get_property (obj_p, value_magic_string_p) != NULL)
-      {
-        ECMA_TRY_CATCH (value_prop_value,
-                        ecma_op_object_get (obj_p, value_magic_string_p),
-                        ret_value);
+      ECMA_TRY_CATCH (value_prop_value,
+                      ecma_op_object_find (obj_p, value_magic_string_p),
+                      ret_value);

+      if (ecma_is_value_found (value_prop_value))
+      {
        prop_desc.is_value_defined = true;
        prop_desc.value = ecma_copy_value (value_prop_value);
-
-        ECMA_FINALIZE (value_prop_value);
      }

+      ECMA_FINALIZE (value_prop_value);
+
      ecma_deref_ecma_string (value_magic_string_p);
    }

@@ -647,18 +647,18 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
      // 6.
      ecma_string_t *writable_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_WRITABLE);

-      if (ecma_op_object_get_property (obj_p, writable_magic_string_p) != NULL)
-      {
-        ECMA_TRY_CATCH (writable_prop_value,
-                        ecma_op_object_get (obj_p, writable_magic_string_p),
-                        ret_value);
+      ECMA_TRY_CATCH (writable_prop_value,
+                      ecma_op_object_find (obj_p, writable_magic_string_p),
+                      ret_value);

+      if (ecma_is_value_found (writable_prop_value))
+      {
        prop_desc.is_writable_defined = true;
        prop_desc.is_writable = ecma_op_to_boolean (writable_prop_value);
-
-        ECMA_FINALIZE (writable_prop_value);
      }

+      ECMA_FINALIZE (writable_prop_value);
+
      ecma_deref_ecma_string (writable_magic_string_p);
    }

@@ -669,12 +669,12 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
      // 7.
      ecma_string_t *get_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_GET);

-      if (ecma_op_object_get_property (obj_p, get_magic_string_p) != NULL)
-      {
-        ECMA_TRY_CATCH (get_prop_value,
-                        ecma_op_object_get (obj_p, get_magic_string_p),
-                        ret_value);
+      ECMA_TRY_CATCH (get_prop_value,
+                      ecma_op_object_find (obj_p, get_magic_string_p),
+                      ret_value);

+      if (ecma_is_value_found (get_prop_value))
+      {
        if (!ecma_op_is_callable (get_prop_value)
            && !ecma_is_value_undefined (get_prop_value))
        {
@@ -698,10 +698,10 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
            prop_desc.get_p = get_p;
          }
        }
-
-        ECMA_FINALIZE (get_prop_value);
      }

+      ECMA_FINALIZE (get_prop_value);
+
      ecma_deref_ecma_string (get_magic_string_p);
    }

@@ -713,12 +713,12 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */

      ecma_string_t *set_magic_string_p = ecma_get_magic_string (LIT_MAGIC_STRING_SET);

-      if (ecma_op_object_get_property (obj_p, set_magic_string_p) != NULL)
-      {
-        ECMA_TRY_CATCH (set_prop_value,
-                        ecma_op_object_get (obj_p, set_magic_string_p),
-                        ret_value);
+      ECMA_TRY_CATCH (set_prop_value,
+                      ecma_op_object_find (obj_p, set_magic_string_p),
+                      ret_value);

+      if (ecma_is_value_found (set_prop_value))
+      {
        if (!ecma_op_is_callable (set_prop_value)
            && !ecma_is_value_undefined (set_prop_value))
        {
@@ -742,10 +742,10 @@ ecma_op_to_property_descriptor (ecma_value_t obj_value, /**< object value */
            prop_desc.set_p = set_p;
          }
        }
-
-        ECMA_FINALIZE (set_prop_value);
      }

+      ECMA_FINALIZE (set_prop_value);
+
      ecma_deref_ecma_string (set_magic_string_p);
    }

@@ -104,7 +104,7 @@ ecma_op_has_binding (ecma_object_t *lex_env_p, /**< lexical environment */

    ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);

-    return (ecma_op_object_get_property (binding_obj_p, name_p) != NULL);
+    return ecma_op_object_has_property (binding_obj_p, name_p);
  }
 } /* ecma_op_has_binding */

@@ -270,19 +270,21 @@ ecma_op_get_binding_value (ecma_object_t *lex_env_p, /**< lexical environment */

    ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);

-    if (ecma_op_object_get_property (binding_obj_p, name_p) == NULL)
+    ecma_value_t result = ecma_op_object_find (binding_obj_p, name_p);
+
+    if (!ecma_is_value_found (result))
    {
      if (is_strict)
      {
-        return ecma_raise_reference_error (ECMA_ERR_MSG (""));
+        result = ecma_raise_reference_error (ECMA_ERR_MSG (""));
      }
      else
      {
-        return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
+        result = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
      }
    }

-    return ecma_op_object_get (binding_obj_p, name_p);
+    return result;
  }
 } /* ecma_op_get_binding_value */

@@ -21,6 +21,7 @@
 #include "ecma-gc.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
+#include "ecma-lcache.h"
 #include "ecma-lex-env.h"
 #include "ecma-objects.h"
 #include "ecma-objects-arguments.h"
@@ -265,108 +266,43 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function
 * @return ecma value
 *         Returned value must be freed with ecma_free_value
 */
-static ecma_value_t
-ecma_arguments_get_mapped_arg_value (ecma_object_t *map_p, /**< [[ParametersMap]] object */
-                                     ecma_property_t *arg_name_prop_p) /**< property of [[ParametersMap]]
-                                                                            corresponding to index and value
-                                                                            equal to mapped argument's name */
+void
+ecma_arguments_update_mapped_arg_value (ecma_object_t *object_p, /**< the object */
+                                        ecma_string_t *property_name_p, /**< property name */
+                                        ecma_property_t *property_p) /**< property value */
 {
+  ecma_value_t *map_prop_p = ecma_get_internal_property (object_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
+  ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);
+
+  ecma_value_t arg_name = ecma_op_object_find (map_p, property_name_p);
+
+  if (!ecma_is_value_found (arg_name))
+  {
+    return;
+  }
+
  ecma_value_t *scope_prop_p = ecma_get_internal_property (map_p, ECMA_INTERNAL_PROPERTY_SCOPE);
  ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *scope_prop_p);

  JERRY_ASSERT (lex_env_p != NULL
                && ecma_is_lexical_environment (lex_env_p));

-  ecma_value_t arg_name_prop_value = ecma_get_named_data_property_value (arg_name_prop_p);
+  ecma_string_t *arg_name_p = ecma_get_string_from_value (arg_name);
+  ecma_value_t value = ecma_op_get_binding_value (lex_env_p, arg_name_p, true);
+  ecma_deref_ecma_string (arg_name_p);

-  ecma_string_t *arg_name_p = ecma_get_string_from_value (arg_name_prop_value);
+  JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (value));

-  ecma_value_t completion = ecma_op_get_binding_value (lex_env_p, arg_name_p, true);
-  JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (completion));
+  ecma_named_data_property_assign_value (object_p, property_p, value);
+  ecma_free_value (value);

-  return completion;
-} /* ecma_arguments_get_mapped_arg_value */
-
-/**
- * [[Get]] ecma Arguments object's operation
- *
- * See also:
- *          ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
- *          ECMA-262 v5, 10.6
- *
- * @return ecma value
- *         Returned value must be freed with ecma_free_value
- */
-ecma_value_t
-ecma_op_arguments_object_get (ecma_object_t *obj_p, /**< the object */
-                              ecma_string_t *property_name_p) /**< property name */
-{
-  // 1.
-  ecma_value_t *map_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
-  ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);
-
-  // 2.
-  ecma_property_t *mapped_prop_p = ecma_op_object_get_own_property (map_p, property_name_p);
-
-  // 3.
-  if (mapped_prop_p == NULL)
+  /* These properties cannot be cached. This is a temporary
+   * workaround until the property management is fully rewritten. */
+  if (ecma_is_property_lcached (property_p))
  {
-    /* We don't check for 'caller' (item 3.b) here, because the 'caller' property is defined
-       as non-configurable and it's get/set are set to [[ThrowTypeError]] object */
-
-    return ecma_op_general_object_get (obj_p, property_name_p);
+    ecma_lcache_invalidate (object_p, property_name_p, property_p);
  }
-  else
-  {
-    // 4.
-    return ecma_arguments_get_mapped_arg_value (map_p, mapped_prop_p);
-  }
-} /* ecma_op_arguments_object_get */
-
-/**
- * [[GetOwnProperty]] ecma Arguments object's operation
- *
- * See also:
- *          ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
- *          ECMA-262 v5, 10.6
- *
- * @return ecma value
- *         Returned value must be freed with ecma_free_value
- */
-ecma_property_t *
-ecma_op_arguments_object_get_own_property (ecma_object_t *obj_p, /**< the object */
-                                           ecma_string_t *property_name_p) /**< property name */
-{
-  // 1.
-  ecma_property_t *desc_p = ecma_op_general_object_get_own_property (obj_p, property_name_p);
-
-  // 2.
-  if (desc_p == NULL)
-  {
-    return desc_p;
-  }
-
-  // 3.
-  ecma_value_t *map_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
-  ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);
-
-  // 4.
-  ecma_property_t *mapped_prop_p = ecma_op_object_get_own_property (map_p, property_name_p);
-
-  // 5.
-  if (mapped_prop_p != NULL)
-  {
-    // a.
-    ecma_value_t completion = ecma_arguments_get_mapped_arg_value (map_p, mapped_prop_p);
-
-    ecma_named_data_property_assign_value (obj_p, desc_p, completion);
-
-    ecma_free_value (completion);
-  }
-
-  // 6.
-  return desc_p;
-} /* ecma_op_arguments_object_get_own_property */
+} /* ecma_arguments_update_mapped_arg_value */

 /**
 * [[DefineOwnProperty]] ecma Arguments object's operation
@@ -389,9 +325,6 @@ ecma_op_arguments_object_define_own_property (ecma_object_t *obj_p, /**< the obj
  ecma_value_t *map_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
  ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);

-  // 2.
-  ecma_property_t *mapped_prop_p = ecma_op_object_get_own_property (map_p, property_name_p);
-
  // 3.
  ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);

@@ -403,7 +336,7 @@ ecma_op_arguments_object_define_own_property (ecma_object_t *obj_p, /**< the obj
                  ret_value);

  // 5.
-  if (mapped_prop_p != NULL)
+  if (ecma_op_object_has_own_property (map_p, property_name_p))
  {
    // a.
    if (property_desc_p->is_get_defined
@@ -485,9 +418,6 @@ ecma_op_arguments_object_delete (ecma_object_t *obj_p, /**< the object */
  ecma_value_t *map_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
  ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);

-  // 2.
-  ecma_property_t *mapped_prop_p = ecma_op_object_get_own_property (map_p, property_name_p);
-
  // 3.
  ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);

@@ -499,7 +429,7 @@ ecma_op_arguments_object_delete (ecma_object_t *obj_p, /**< the object */

  if (ecma_is_value_true (delete_in_args_ret))
  {
-    if (mapped_prop_p != NULL)
+    if (ecma_op_object_has_own_property (map_p, property_name_p))
    {
      ecma_value_t delete_in_map_completion = ecma_op_object_delete (map_p, property_name_p, false);
      JERRY_ASSERT (ecma_is_value_true (delete_in_map_completion));
@@ -23,10 +23,8 @@ extern void
 ecma_op_create_arguments_object (ecma_object_t *, ecma_object_t *, const ecma_value_t *,
                                 ecma_length_t, const ecma_compiled_code_t *);

-extern ecma_value_t
-ecma_op_arguments_object_get (ecma_object_t *, ecma_string_t *);
-extern ecma_property_t *
-ecma_op_arguments_object_get_own_property (ecma_object_t *, ecma_string_t *);
+extern void
+ecma_arguments_update_mapped_arg_value (ecma_object_t *, ecma_string_t *, ecma_property_t *);
 extern ecma_value_t
 ecma_op_arguments_object_delete (ecma_object_t *, ecma_string_t *, bool);
 extern ecma_value_t
@@ -129,60 +129,6 @@ ecma_op_create_object_object_noarg_and_set_prototype (ecma_object_t *object_prot
  return obj_p;
 } /* ecma_op_create_object_object_noarg_and_set_prototype */

-/**
- * [[Get]] ecma general object's operation
- *
- * See also:
- *          ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
- *          ECMA-262 v5, 8.12.3
- *
- * @return ecma value
- *         Returned value must be freed with ecma_free_value
- */
-ecma_value_t
-ecma_op_general_object_get (ecma_object_t *obj_p, /**< the object */
-                            ecma_string_t *property_name_p) /**< property name */
-{
-  JERRY_ASSERT (obj_p != NULL
-                && !ecma_is_lexical_environment (obj_p));
-  JERRY_ASSERT (property_name_p != NULL);
-
-  // 1.
-  const ecma_property_t *prop_p = ecma_op_object_get_property (obj_p, property_name_p);
-
-  // 2.
-  if (prop_p == NULL)
-  {
-    return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
-  }
-
-  // 3.
-  if (ECMA_PROPERTY_GET_TYPE (prop_p) == ECMA_PROPERTY_TYPE_NAMEDDATA)
-  {
-    return ecma_copy_value (ecma_get_named_data_property_value (prop_p));
-  }
-  else
-  {
-    // 4.
-    ecma_object_t *getter_p = ecma_get_named_accessor_property_getter (prop_p);
-
-    // 5.
-    if (getter_p == NULL)
-    {
-      return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
-    }
-    else
-    {
-      return ecma_op_function_call (getter_p,
-                                    ecma_make_object_value (obj_p),
-                                    NULL,
-                                    0);
-    }
-  }
-
-  JERRY_UNREACHABLE ();
-} /* ecma_op_general_object_get */
-
 /**
 * [[GetOwnProperty]] ecma general object's operation
 *
@@ -204,47 +150,6 @@ ecma_op_general_object_get_own_property (ecma_object_t *obj_p, /**< the object *
  return ecma_find_named_property (obj_p, property_name_p);
 } /* ecma_op_general_object_get_own_property */

-/**
- * [[GetProperty]] ecma general object's operation
- *
- * See also:
- *          ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
- *          ECMA-262 v5, 8.12.2
- *
- * @return pointer to a property - if it exists,
- *         NULL (i.e. ecma-undefined) - otherwise.
- */
-ecma_property_t *
-ecma_op_general_object_get_property (ecma_object_t *obj_p, /**< the object */
-                                     ecma_string_t *property_name_p) /**< property name */
-{
-  JERRY_ASSERT (obj_p != NULL
-                && !ecma_is_lexical_environment (obj_p));
-  JERRY_ASSERT (property_name_p != NULL);
-
-  // 1.
-  ecma_property_t *prop_p = ecma_op_object_get_own_property (obj_p, property_name_p);
-
-  // 2.
-  if (prop_p != NULL)
-  {
-    return prop_p;
-  }
-
-  // 3.
-  ecma_object_t *prototype_p = ecma_get_object_prototype (obj_p);
-
-  // 4., 5.
-  if (prototype_p != NULL)
-  {
-    return ecma_op_object_get_property (prototype_p, property_name_p);
-  }
-  else
-  {
-    return NULL;
-  }
-} /* ecma_op_general_object_get_property */
-
 /**
 * [[Put]] ecma general object's operation
 *
@@ -31,9 +31,7 @@ extern ecma_object_t *ecma_op_create_object_object_noarg (void);
 extern ecma_value_t ecma_op_create_object_object_arg (ecma_value_t);
 extern ecma_object_t *ecma_op_create_object_object_noarg_and_set_prototype (ecma_object_t *);

-extern ecma_value_t ecma_op_general_object_get (ecma_object_t *, ecma_string_t *);
 extern ecma_property_t *ecma_op_general_object_get_own_property (ecma_object_t *, ecma_string_t *);
-extern ecma_property_t *ecma_op_general_object_get_property (ecma_object_t *, ecma_string_t *);
 extern ecma_value_t ecma_op_general_object_put (ecma_object_t *, ecma_string_t *, ecma_value_t, bool);
 extern ecma_value_t ecma_op_general_object_delete (ecma_object_t *, ecma_string_t *, bool);
 extern ecma_value_t ecma_op_general_object_default_value (ecma_object_t *, ecma_preferred_type_hint_t);
@@ -20,6 +20,7 @@
 #include "ecma-globals.h"
 #include "ecma-function-object.h"
 #include "ecma-lcache.h"
+#include "ecma-lex-env.h"
 #include "ecma-string-object.h"
 #include "ecma-objects-arguments.h"
 #include "ecma-objects-general.h"
@@ -55,40 +56,6 @@
 #define JERRY_ASSERT_OBJECT_TYPE_IS_VALID(type)
 #endif /* !JERRY_NDEBUG */

-/**
- * [[Get]] ecma object's operation
- *
- * See also:
- *          ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
- *
- * @return ecma value
- *         Returned value must be freed with ecma_free_value
- */
-ecma_value_t
-ecma_op_object_get (ecma_object_t *obj_p, /**< the object */
-                    ecma_string_t *property_name_p) /**< property name */
-{
-  JERRY_ASSERT (obj_p != NULL
-                && !ecma_is_lexical_environment (obj_p));
-  JERRY_ASSERT (property_name_p != NULL);
-
-  const ecma_object_type_t type = ecma_get_object_type (obj_p);
-
-  if (unlikely (type == ECMA_OBJECT_TYPE_ARGUMENTS))
-  {
-    return ecma_op_arguments_object_get (obj_p, property_name_p);
-  }
-
-  JERRY_ASSERT (type == ECMA_OBJECT_TYPE_GENERAL
-                || type == ECMA_OBJECT_TYPE_FUNCTION
-                || type == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION
-                || type == ECMA_OBJECT_TYPE_ARRAY
-                || type == ECMA_OBJECT_TYPE_STRING
-                || type == ECMA_OBJECT_TYPE_BOUND_FUNCTION);
-
-  return ecma_op_general_object_get (obj_p, property_name_p);
-} /* ecma_op_object_get */
-
 /**
 * Long path for ecma_op_object_get_own_property
 *
@@ -132,8 +99,12 @@ ecma_op_object_get_own_property_longpath (ecma_object_t *obj_p, /**< the object

    case ECMA_OBJECT_TYPE_ARGUMENTS:
    {
-      prop_p = ecma_op_arguments_object_get_own_property (obj_p, property_name_p);
+      prop_p = ecma_op_general_object_get_own_property (obj_p, property_name_p);

+      if (prop_p != NULL)
+      {
+        ecma_arguments_update_mapped_arg_value (obj_p, property_name_p, prop_p);
+      }
      break;
    }

@@ -178,10 +149,8 @@ ecma_op_object_get_own_property (ecma_object_t *obj_p, /**< the object */
  {
    return prop_p;
  }
-  else
-  {
-    return ecma_op_object_get_own_property_longpath (obj_p, property_name_p);
-  }
+
+  return ecma_op_object_get_own_property_longpath (obj_p, property_name_p);
 } /* ecma_op_object_get_own_property */

 /**
@@ -194,33 +163,202 @@ ecma_op_object_get_own_property (ecma_object_t *obj_p, /**< the object */
 *         NULL (i.e. ecma-undefined) - otherwise.
 */
 ecma_property_t *
-ecma_op_object_get_property (ecma_object_t *obj_p, /**< the object */
+ecma_op_object_get_property (ecma_object_t *object_p, /**< the object */
                             ecma_string_t *property_name_p) /**< property name */
 {
-  JERRY_ASSERT (obj_p != NULL
-                && !ecma_is_lexical_environment (obj_p));
+  /* Circular reference is possible in JavaScript and testing it is complicated. */
+  int max_depth = 128;
+
+  do
+  {
+    ecma_property_t *property_p = ecma_op_object_get_own_property (object_p, property_name_p);
+
+    if (property_p != NULL)
+    {
+      return property_p;
+    }
+
+    if (--max_depth == 0)
+    {
+      break;
+    }
+
+    object_p = ecma_get_object_prototype (object_p);
+  }
+  while (object_p != NULL);
+
+  return NULL;
+} /* ecma_op_object_get_property */
+
+/**
+ * Checks whether an object (excluding prototypes) has a named property
+ *
+ * @return true if property is found
+ *         false otherwise
+ */
+inline bool __attr_always_inline___
+ecma_op_object_has_own_property (ecma_object_t *object_p, /**< the object */
+                                 ecma_string_t *property_name_p) /**< property name */
+{
+  return ecma_op_object_get_own_property (object_p, property_name_p) != NULL;
+} /* ecma_op_object_has_own_property */
+
+/**
+ * Checks whether an object (including prototypes) has a named property
+ *
+ * @return true if property is found
+ *         false otherwise
+ */
+inline bool __attr_always_inline___
+ecma_op_object_has_property (ecma_object_t *object_p, /**< the object */
+                             ecma_string_t *property_name_p) /**< property name */
+{
+  return ecma_op_object_get_property (object_p, property_name_p) != NULL;
+} /* ecma_op_object_has_property */
+
+/**
+ * Search the value corresponding to a property name
+ *
+ * Note: search includes prototypes
+ *
+ * @return ecma value if property is found
+ *         ECMA_SIMPLE_VALUE_NOT_FOUND if property is not found
+ *         Returned value must be freed with ecma_free_value
+ */
+ecma_value_t
+ecma_op_object_find_own (ecma_object_t *object_p, /**< the object */
+                         ecma_string_t *property_name_p) /**< property name */
+{
+  JERRY_ASSERT (object_p != NULL
+                && !ecma_is_lexical_environment (object_p));
  JERRY_ASSERT (property_name_p != NULL);

-  JERRY_ASSERT_OBJECT_TYPE_IS_VALID (ecma_get_object_type (obj_p));
+  if (unlikely (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_ARGUMENTS))
+  {
+    ecma_value_t *map_prop_p = ecma_get_internal_property (object_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
+    ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);

-  /*
-   * typedef ecma_property_t * (*get_property_ptr_t) (ecma_object_t *, ecma_string_t *);
-   * static const get_property_ptr_t get_property [ECMA_OBJECT_TYPE__COUNT] =
-   * {
-   *   [ECMA_OBJECT_TYPE_GENERAL]           = &ecma_op_general_object_get_property,
-   *   [ECMA_OBJECT_TYPE_FUNCTION]          = &ecma_op_general_object_get_property,
-   *   [ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION] = &ecma_op_general_object_get_property,
-   *   [ECMA_OBJECT_TYPE_ARRAY]             = &ecma_op_general_object_get_property,
-   *   [ECMA_OBJECT_TYPE_STRING]            = &ecma_op_general_object_get_property,
-   *   [ECMA_OBJECT_TYPE_BOUND_FUNCTION]    = &ecma_op_general_object_get_property,
-   *   [ECMA_OBJECT_TYPE_ARGUMENTS]         = &ecma_op_general_object_get_property
-   * };
-   *
-   * return get_property[type] (obj_p, property_name_p);
-   */
+    ecma_value_t arg_name = ecma_op_object_find_own (map_p, property_name_p);

-  return ecma_op_general_object_get_property (obj_p, property_name_p);
-} /* ecma_op_object_get_property */
+    if (ecma_is_value_found (arg_name))
+    {
+      ecma_value_t *scope_prop_p = ecma_get_internal_property (map_p, ECMA_INTERNAL_PROPERTY_SCOPE);
+      ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *scope_prop_p);
+
+      JERRY_ASSERT (lex_env_p != NULL
+                    && ecma_is_lexical_environment (lex_env_p));
+
+      ecma_string_t *arg_name_p = ecma_get_string_from_value (arg_name);
+      ecma_value_t result = ecma_op_get_binding_value (lex_env_p, arg_name_p, true);
+      ecma_deref_ecma_string (arg_name_p);
+      return result;
+    }
+  }
+
+  ecma_property_t *property_p = ecma_op_object_get_own_property (object_p, property_name_p);
+
+  if (property_p == NULL)
+  {
+    return ecma_make_simple_value (ECMA_SIMPLE_VALUE_NOT_FOUND);
+  }
+
+  if (ECMA_PROPERTY_GET_TYPE (property_p) == ECMA_PROPERTY_TYPE_NAMEDDATA)
+  {
+    return ecma_fast_copy_value (ecma_get_named_data_property_value (property_p));
+  }
+
+  ecma_object_t *getter_p = ecma_get_named_accessor_property_getter (property_p);
+
+  if (getter_p == NULL)
+  {
+    return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
+  }
+
+  return ecma_op_function_call (getter_p, ecma_make_object_value (object_p), NULL, 0);
+} /* ecma_op_object_find_own */
+
+/**
+ * Search the value corresponding to a property name
+ *
+ * Note: search includes prototypes
+ *
+ * @return ecma value if property is found
+ *         ECMA_SIMPLE_VALUE_NOT_FOUND if property is not found
+ *         Returned value must be freed with ecma_free_value
+ */
+ecma_value_t
+ecma_op_object_find (ecma_object_t *object_p, /**< the object */
+                     ecma_string_t *property_name_p) /**< property name */
+{
+  /* Circular reference is possible in JavaScript and testing it is complicated. */
+  int max_depth = 128;
+
+  do
+  {
+    ecma_value_t value = ecma_op_object_find_own (object_p, property_name_p);
+
+    if (ecma_is_value_found (value))
+    {
+      return value;
+    }
+
+    if (--max_depth == 0)
+    {
+      break;
+    }
+
+    object_p = ecma_get_object_prototype (object_p);
+  }
+  while (object_p != NULL);
+
+  return ecma_make_simple_value (ECMA_SIMPLE_VALUE_NOT_FOUND);
+} /* ecma_op_object_find */
+
+/**
+ * Get own property by name
+ *
+ * Note: property must be an existing data property
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value
+ */
+inline ecma_value_t __attr_always_inline___
+ecma_op_object_get_own_data_prop (ecma_object_t *object_p, /**< the object */
+                                  ecma_string_t *property_name_p) /**< property name */
+{
+#ifndef JERRY_NDEBUG
+  ecma_property_t *property_p = ecma_op_object_get_own_property (object_p, property_name_p);
+
+  JERRY_ASSERT (property_p != NULL
+                && ECMA_PROPERTY_GET_TYPE (property_p) == ECMA_PROPERTY_TYPE_NAMEDDATA
+                && !ecma_is_property_configurable (property_p));
+#endif /* !JERRY_NDEBUG */
+
+  return ecma_op_object_find (object_p, property_name_p);
+} /* ecma_op_object_get_own_data_prop */
+
+/**
+ * [[Get]] ecma object's operation
+ *
+ * See also:
+ *          ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
+ *
+ * @return ecma value
+ *         Returned value must be freed with ecma_free_value
+ */
+ecma_value_t
+ecma_op_object_get (ecma_object_t *object_p, /**< the object */
+                    ecma_string_t *property_name_p) /**< property name */
+{
+  ecma_value_t value = ecma_op_object_find (object_p, property_name_p);
+
+  if (!ecma_is_value_found (value))
+  {
+    value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
+  }
+
+  return value;
+} /* ecma_op_object_get */

 /**
 * [[Put]] ecma object's operation
@@ -26,9 +26,14 @@
 * @{
 */

-extern ecma_value_t ecma_op_object_get (ecma_object_t *, ecma_string_t *);
 extern ecma_property_t *ecma_op_object_get_own_property (ecma_object_t *, ecma_string_t *);
 extern ecma_property_t *ecma_op_object_get_property (ecma_object_t *, ecma_string_t *);
+extern bool ecma_op_object_has_own_property (ecma_object_t *, ecma_string_t *);
+extern bool ecma_op_object_has_property (ecma_object_t *, ecma_string_t *);
+extern ecma_value_t ecma_op_object_find_own (ecma_object_t *, ecma_string_t *);
+extern ecma_value_t ecma_op_object_find (ecma_object_t *, ecma_string_t *);
+extern ecma_value_t ecma_op_object_get_own_data_prop (ecma_object_t *, ecma_string_t *);
+extern ecma_value_t ecma_op_object_get (ecma_object_t *, ecma_string_t *);
 extern ecma_value_t ecma_op_object_put (ecma_object_t *, ecma_string_t *, ecma_value_t, bool);
 extern ecma_value_t ecma_op_object_delete (ecma_object_t *, ecma_string_t *, bool);
 extern ecma_value_t ecma_op_object_default_value (ecma_object_t *, ecma_preferred_type_hint_t);
@@ -105,26 +105,11 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical

      ecma_object_t *binding_obj_p = ecma_get_lex_env_binding_object (lex_env_p);

-      ecma_property_t *property_p = ecma_op_object_get_property (binding_obj_p, name_p);
+      ecma_value_t prop_value = ecma_op_object_find (binding_obj_p, name_p);

-      if (likely (property_p != NULL))
+      if (ecma_is_value_found (prop_value))
      {
-        if (ECMA_PROPERTY_GET_TYPE (property_p) == ECMA_PROPERTY_TYPE_NAMEDDATA)
-        {
-          return ecma_fast_copy_value (ecma_get_named_data_property_value (property_p));
-        }
-
-        ecma_object_t *getter_p = ecma_get_named_accessor_property_getter (property_p);
-
-        if (getter_p == NULL)
-        {
-          return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
-        }
-
-        return ecma_op_function_call (getter_p,
-                                      ecma_make_object_value (binding_obj_p),
-                                      NULL,
-                                      0);
+        return prop_value;
      }
    }

@@ -1311,11 +1311,9 @@ ecma_regexp_exec_helper (ecma_value_t regexp_value, /**< RegExp object */
  if (input_buffer_p && (re_ctx.flags & RE_FLAG_GLOBAL))
  {
    ecma_string_t *magic_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_LASTINDEX_UL);
-    ecma_property_t *lastindex_prop_p = ecma_op_object_get_property (regexp_object_p, magic_str_p);
+    ecma_value_t lastindex_value = ecma_op_object_get_own_data_prop (regexp_object_p, magic_str_p);

-    ECMA_OP_TO_NUMBER_TRY_CATCH (lastindex_num,
-                                 ecma_get_named_data_property_value (lastindex_prop_p),
-                                 ret_value)
+    ECMA_OP_TO_NUMBER_TRY_CATCH (lastindex_num, lastindex_value, ret_value)

    index = ecma_number_to_int32 (lastindex_num);

@@ -1331,6 +1329,8 @@ ecma_regexp_exec_helper (ecma_value_t regexp_value, /**< RegExp object */

    ECMA_OP_TO_NUMBER_FINALIZE (lastindex_num);

+    ecma_fast_free_value (lastindex_value);
+
    ecma_deref_ecma_string (magic_str_p);
  }