Fix invalid assertion condition in jump opcode handlers.

ruben-ayrapetyan · ruben-ayrapetyan · commit 89a74499138e · 2015-06-23T12:31:45.000+03:00
Related issue: #120 JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
diff --git a/jerry-core/vm/opcodes-agnostic.cpp b/jerry-core/vm/opcodes-agnostic.cpp
@@ -40,7 +40,7 @@ opfunc_is_true_jmp_down (opcode_t opdata, /**< operation data */
 
   if (ecma_is_completion_value_normal_true (to_bool_completion))
   {
-    JERRY_ASSERT (offset != 0 && ((uint32_t) int_data->pos + offset < MAX_OPCODES));
+    JERRY_ASSERT ((uint32_t) int_data->pos + offset < MAX_OPCODES);
     int_data->pos = (opcode_counter_t) (int_data->pos + offset);
   }
   else
@@ -73,7 +73,7 @@ opfunc_is_true_jmp_up (opcode_t opdata, /**< operation data */
 
   if (ecma_is_completion_value_normal_true (to_bool_completion))
   {
-    JERRY_ASSERT (offset != 0 && (uint32_t) int_data->pos >= offset);
+    JERRY_ASSERT ((uint32_t) int_data->pos >= offset);
     int_data->pos = (opcode_counter_t) (int_data->pos - offset);
   }
   else
@@ -112,7 +112,7 @@ opfunc_is_false_jmp_down (opcode_t opdata, /**< operation data */
 
   if (!ecma_is_completion_value_normal_true (to_bool_completion))
   {
-    JERRY_ASSERT (offset != 0 && ((uint32_t) int_data->pos + offset < MAX_OPCODES));
+    JERRY_ASSERT ((uint32_t) int_data->pos + offset < MAX_OPCODES);
     int_data->pos = (opcode_counter_t) (int_data->pos + offset);
   }
   else
@@ -145,7 +145,7 @@ opfunc_is_false_jmp_up (opcode_t opdata, /**< operation data */
 
   if (!ecma_is_completion_value_normal_true (to_bool_completion))
   {
-    JERRY_ASSERT (offset != 0 && (uint32_t) int_data->pos >= offset);
+    JERRY_ASSERT ((uint32_t) int_data->pos >= offset);
     int_data->pos = (opcode_counter_t) (int_data->pos - offset);
   }
   else
@@ -173,7 +173,7 @@ opfunc_jmp_down (opcode_t opdata, /**< operation data */
   const opcode_counter_t offset = calc_opcode_counter_from_idx_idx (opdata.data.jmp_down.opcode_1,
                                                                     opdata.data.jmp_down.opcode_2);
 
-  JERRY_ASSERT (offset != 0 && ((uint32_t) int_data->pos + offset < MAX_OPCODES));
+  JERRY_ASSERT (((uint32_t) int_data->pos + offset < MAX_OPCODES));
 
   int_data->pos = (opcode_counter_t) (int_data->pos + offset);
 
@@ -192,7 +192,7 @@ opfunc_jmp_up (opcode_t opdata, /**< operation data */
 {
   const opcode_counter_t offset = calc_opcode_counter_from_idx_idx (opdata.data.jmp_up.opcode_1,
                                                                     opdata.data.jmp_up.opcode_2);
-  JERRY_ASSERT (offset != 0 && (uint32_t) int_data->pos >= offset);
+  JERRY_ASSERT ((uint32_t) int_data->pos >= offset);
 
   int_data->pos = (opcode_counter_t) (int_data->pos - offset);
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ opfunc_is_true_jmp_down (opcode_t opdata, /*< operation data /`
`40`	`40`
`41`	`41`	`if (ecma_is_completion_value_normal_true (to_bool_completion))`
`42`	`42`	`{`
`43`		`- JERRY_ASSERT (offset != 0 && ((uint32_t) int_data->pos + offset < MAX_OPCODES));`
	`43`	`+ JERRY_ASSERT ((uint32_t) int_data->pos + offset < MAX_OPCODES);`
`44`	`44`	`int_data->pos = (opcode_counter_t) (int_data->pos + offset);`
`45`	`45`	`}`
`46`	`46`	`else`
`@@ -73,7 +73,7 @@ opfunc_is_true_jmp_up (opcode_t opdata, /*< operation data /`
`73`	`73`
`74`	`74`	`if (ecma_is_completion_value_normal_true (to_bool_completion))`
`75`	`75`	`{`
`76`		`- JERRY_ASSERT (offset != 0 && (uint32_t) int_data->pos >= offset);`
	`76`	`+ JERRY_ASSERT ((uint32_t) int_data->pos >= offset);`
`77`	`77`	`int_data->pos = (opcode_counter_t) (int_data->pos - offset);`
`78`	`78`	`}`
`79`	`79`	`else`
`@@ -112,7 +112,7 @@ opfunc_is_false_jmp_down (opcode_t opdata, /*< operation data /`
`112`	`112`
`113`	`113`	`if (!ecma_is_completion_value_normal_true (to_bool_completion))`
`114`	`114`	`{`
`115`		`- JERRY_ASSERT (offset != 0 && ((uint32_t) int_data->pos + offset < MAX_OPCODES));`
	`115`	`+ JERRY_ASSERT ((uint32_t) int_data->pos + offset < MAX_OPCODES);`
`116`	`116`	`int_data->pos = (opcode_counter_t) (int_data->pos + offset);`
`117`	`117`	`}`
`118`	`118`	`else`
`@@ -145,7 +145,7 @@ opfunc_is_false_jmp_up (opcode_t opdata, /*< operation data /`
`145`	`145`
`146`	`146`	`if (!ecma_is_completion_value_normal_true (to_bool_completion))`
`147`	`147`	`{`
`148`		`- JERRY_ASSERT (offset != 0 && (uint32_t) int_data->pos >= offset);`
	`148`	`+ JERRY_ASSERT ((uint32_t) int_data->pos >= offset);`
`149`	`149`	`int_data->pos = (opcode_counter_t) (int_data->pos - offset);`
`150`	`150`	`}`
`151`	`151`	`else`
`@@ -173,7 +173,7 @@ opfunc_jmp_down (opcode_t opdata, /*< operation data /`
`173`	`173`	`const opcode_counter_t offset = calc_opcode_counter_from_idx_idx (opdata.data.jmp_down.opcode_1,`
`174`	`174`	`opdata.data.jmp_down.opcode_2);`
`175`	`175`
`176`		`- JERRY_ASSERT (offset != 0 && ((uint32_t) int_data->pos + offset < MAX_OPCODES));`
	`176`	`+ JERRY_ASSERT (((uint32_t) int_data->pos + offset < MAX_OPCODES));`
`177`	`177`
`178`	`178`	`int_data->pos = (opcode_counter_t) (int_data->pos + offset);`
`179`	`179`
`@@ -192,7 +192,7 @@ opfunc_jmp_up (opcode_t opdata, /*< operation data /`
`192`	`192`	`{`
`193`	`193`	`const opcode_counter_t offset = calc_opcode_counter_from_idx_idx (opdata.data.jmp_up.opcode_1,`
`194`	`194`	`opdata.data.jmp_up.opcode_2);`
`195`		`- JERRY_ASSERT (offset != 0 && (uint32_t) int_data->pos >= offset);`
	`195`	`+ JERRY_ASSERT ((uint32_t) int_data->pos >= offset);`
`196`	`196`
`197`	`197`	`int_data->pos = (opcode_counter_t) (int_data->pos - offset);`
`198`	`198`