From 11f0cf9a2daf42101f8cbd68d1885eb9e6001d8f Mon Sep 17 00:00:00 2001
From: Ruben Ayrapetyan <r.ayrapetyan@samsung.com>
Date: Thu, 13 Nov 2014 14:28:45 +0300
Subject: [PATCH] Performing do_strict_eval_or_arguments_check check only under
 !JERRY_NDEBUG.

---
 src/libcoreint/opcodes-helpers-variables.c | 30 ++++++++--------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/libcoreint/opcodes-helpers-variables.c b/src/libcoreint/opcodes-helpers-variables.c
index c1e6e90e5..0b2d613e9 100644
--- a/src/libcoreint/opcodes-helpers-variables.c
+++ b/src/libcoreint/opcodes-helpers-variables.c
@@ -79,7 +79,7 @@ ecma_completion_value_t
 get_variable_value (int_data_t *int_data, /**< interpreter context */
                     idx_t var_idx, /**< variable identifier */
                     bool do_eval_or_arguments_check) /** run 'strict eval or arguments reference' check
-                                                        See also: do_strict_eval_arguments_check */
+                                                          See also: do_strict_eval_arguments_check */
 {
   ecma_completion_value_t ret_value;
 
@@ -101,16 +101,11 @@ get_variable_value (int_data_t *int_data, /**< interpreter context */
                                             var_name_string_p,
                                             int_data->is_strict);
 
-    if (unlikely (do_eval_or_arguments_check
-                  && do_strict_eval_arguments_check (ref)))
-    {
-      /* SyntaxError should be treated as an early error */
-      JERRY_UNREACHABLE ();
-    }
-    else
-    {
-      ret_value = ecma_op_get_value (ref);
-    }
+    /* SyntaxError should be treated as an early error */
+    JERRY_ASSERT (!do_eval_or_arguments_check
+                  || !do_strict_eval_arguments_check (ref));
+
+    ret_value = ecma_op_get_value (ref);
 
     ecma_deref_ecma_string (var_name_string_p);
     ecma_free_reference (ref);
@@ -155,15 +150,10 @@ set_variable_value (int_data_t *int_data, /**< interpreter context */
                                             var_name_string_p,
                                             int_data->is_strict);
 
-    if (unlikely (do_strict_eval_arguments_check (ref)))
-    {
-      /* SyntaxError should be treated as an early error */
-      JERRY_UNREACHABLE ();
-    }
-    else
-    {
-      ret_value = ecma_op_put_value (ref, value);
-    }
+    /* SyntaxError should be treated as an early error */
+    JERRY_ASSERT (!do_strict_eval_arguments_check (ref));
+
+    ret_value = ecma_op_put_value (ref, value);
 
     ecma_deref_ecma_string (var_name_string_p);
     ecma_free_reference (ref);