Skip to content

Commit 1b193ad

Browse files
ruben-ayrapetyanruben-ayrapetyan
committed
Remove exit completion value type.
JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected]
1 parent 9239845 commit 1b193ad

20 files changed

+34
-141
lines changed

‎jerry-core/ecma/base/ecma-globals.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ typedef enum
120120
* }
121121
*/
122122
ECMA_COMPLETION_TYPE_THROW, /**< completion with throw */
123-
ECMA_COMPLETION_TYPE_EXIT, /**< implementation-defined completion type
124-
for finishing script execution */
125123
ECMA_COMPLETION_TYPE_META /**< implementation-defined completion type
126124
for meta opcode */
127125
} ecma_completion_type_t;

‎jerry-core/ecma/base/ecma-helpers-value.cpp‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,6 @@ ecma_make_completion_value (ecma_completion_type_t type, /**< type */
534534
const bool is_type_ok = (type == ECMA_COMPLETION_TYPE_NORMAL
535535
|| type == ECMA_COMPLETION_TYPE_THROW
536536
|| type == ECMA_COMPLETION_TYPE_RETURN
537-
|| type == ECMA_COMPLETION_TYPE_EXIT
538537
|| (type == ECMA_COMPLETION_TYPE_META
539538
&& ecma_is_value_empty (value)));
540539

@@ -628,21 +627,6 @@ ecma_make_return_completion_value (ecma_value_t value) /**< value */
628627
return ecma_make_completion_value (ECMA_COMPLETION_TYPE_RETURN, value);
629628
} /* ecma_make_return_completion_value */
630629

631-
/**
632-
* Exit completion value constructor
633-
*
634-
* @return completion value
635-
*/
636-
ecma_completion_value_t __attr_const___ __attr_always_inline___
637-
ecma_make_exit_completion_value (bool is_successful) /**< does completion value indicate
638-
successfulness completion
639-
of script execution (true) or not (false) */
640-
{
641-
return ecma_make_completion_value (ECMA_COMPLETION_TYPE_EXIT,
642-
ecma_make_simple_value (is_successful ? ECMA_SIMPLE_VALUE_TRUE
643-
: ECMA_SIMPLE_VALUE_FALSE));
644-
} /* ecma_make_exit_completion_value */
645-
646630
/**
647631
* Meta completion value constructor
648632
*
@@ -685,8 +669,7 @@ ecma_get_completion_value_value (ecma_completion_value_t completion_value) /**<
685669

686670
const bool is_type_ok = (type == ECMA_COMPLETION_TYPE_NORMAL
687671
|| type == ECMA_COMPLETION_TYPE_THROW
688-
|| type == ECMA_COMPLETION_TYPE_RETURN
689-
|| type == ECMA_COMPLETION_TYPE_EXIT);
672+
|| type == ECMA_COMPLETION_TYPE_RETURN);
690673

691674
JERRY_ASSERT (is_type_ok);
692675

@@ -752,8 +735,7 @@ ecma_copy_completion_value (ecma_completion_value_t value) /**< completion value
752735
const bool is_type_ok = (type == ECMA_COMPLETION_TYPE_NORMAL
753736
|| type == ECMA_COMPLETION_TYPE_THROW
754737
|| type == ECMA_COMPLETION_TYPE_RETURN
755-
|| type == ECMA_COMPLETION_TYPE_JUMP
756-
|| type == ECMA_COMPLETION_TYPE_EXIT);
738+
|| type == ECMA_COMPLETION_TYPE_JUMP);
757739

758740
JERRY_ASSERT (is_type_ok);
759741

@@ -778,12 +760,6 @@ ecma_free_completion_value (ecma_completion_value_t completion_value) /**< compl
778760
ecma_free_value (v, true);
779761
break;
780762
}
781-
case ECMA_COMPLETION_TYPE_EXIT:
782-
{
783-
ecma_value_t v = ecma_get_completion_value_value_field (completion_value);
784-
JERRY_ASSERT (ecma_get_value_type_field (v) == ECMA_TYPE_SIMPLE);
785-
break;
786-
}
787763
case ECMA_COMPLETION_TYPE_JUMP:
788764
{
789765
break;
@@ -831,27 +807,6 @@ ecma_is_completion_value_return (ecma_completion_value_t value) /**< completion
831807
return (ecma_get_completion_value_type_field (value) == ECMA_COMPLETION_TYPE_RETURN);
832808
} /* ecma_is_completion_value_return */
833809

834-
/**
835-
* Check if the completion value is exit value.
836-
*
837-
* @return true - if the completion type is exit,
838-
* false - otherwise.
839-
*/
840-
bool __attr_const___ __attr_always_inline___
841-
ecma_is_completion_value_exit (ecma_completion_value_t value) /**< completion value */
842-
{
843-
if (ecma_get_completion_value_type_field (value) == ECMA_COMPLETION_TYPE_EXIT)
844-
{
845-
JERRY_ASSERT (ecma_is_value_boolean (ecma_get_completion_value_value_field (value)));
846-
847-
return true;
848-
}
849-
else
850-
{
851-
return false;
852-
}
853-
} /* ecma_is_completion_value_exit */
854-
855810
/**
856811
* Check if the completion value is meta value.
857812
*

‎jerry-core/ecma/base/ecma-helpers.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ extern ecma_completion_value_t ecma_make_throw_completion_value (ecma_value_t va
8282
extern ecma_completion_value_t ecma_make_throw_obj_completion_value (ecma_object_t *exception_p);
8383
extern ecma_completion_value_t ecma_make_empty_completion_value (void);
8484
extern ecma_completion_value_t ecma_make_return_completion_value (ecma_value_t value);
85-
extern ecma_completion_value_t ecma_make_exit_completion_value (bool is_successful);
8685
extern ecma_completion_value_t ecma_make_meta_completion_value (void);
8786
extern ecma_completion_value_t ecma_make_jump_completion_value (opcode_counter_t target);
8887
extern ecma_value_t ecma_get_completion_value_value (ecma_completion_value_t completion_value);
@@ -100,7 +99,6 @@ extern void ecma_free_completion_value (ecma_completion_value_t completion_value
10099
extern bool ecma_is_completion_value_normal (ecma_completion_value_t value);
101100
extern bool ecma_is_completion_value_throw (ecma_completion_value_t value);
102101
extern bool ecma_is_completion_value_return (ecma_completion_value_t value);
103-
extern bool ecma_is_completion_value_exit (ecma_completion_value_t value);
104102
extern bool ecma_is_completion_value_meta (ecma_completion_value_t value);
105103
extern bool ecma_is_completion_value_jump (ecma_completion_value_t value);
106104
extern bool ecma_is_completion_value_normal_simple_value (ecma_completion_value_t value,

‎jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,8 +696,7 @@ ecma_builtin_array_prototype_object_push (ecma_value_t this_arg, /**< this argum
696696

697697
ecma_deref_ecma_string (n_str_p);
698698

699-
if (unlikely (ecma_is_completion_value_throw (completion)
700-
|| ecma_is_completion_value_exit (completion)))
699+
if (unlikely (ecma_is_completion_value_throw (completion)))
701700
{
702701
ret_value = completion;
703702
break;
@@ -722,8 +721,7 @@ ecma_builtin_array_prototype_object_push (ecma_value_t this_arg, /**< this argum
722721
num_length_value,
723722
true);
724723

725-
if (unlikely (ecma_is_completion_value_throw (completion)
726-
|| ecma_is_completion_value_exit (completion)))
724+
if (unlikely (ecma_is_completion_value_throw (completion)))
727725
{
728726
ret_value = completion;
729727

‎jerry-core/ecma/operations/ecma-eval.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ ecma_op_eval_chars_buffer (const ecma_char_t *code_p, /**< code characters buffe
146146
}
147147
else
148148
{
149-
JERRY_ASSERT (ecma_is_completion_value_throw (completion)
150-
|| ecma_is_completion_value_exit (completion));
149+
JERRY_ASSERT (ecma_is_completion_value_throw (completion));
151150
}
152151

153152
ecma_deref_object (lex_env_p);

‎jerry-core/ecma/operations/ecma-try-catch-macro.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#define ECMA_TRY_CATCH(var, op, return_value) \
3333
JERRY_ASSERT (return_value == ecma_make_empty_completion_value ()); \
3434
ecma_completion_value_t var ## _completion = op; \
35-
if (unlikely (ecma_is_completion_value_throw (var ## _completion) \
36-
|| ecma_is_completion_value_exit (var ## _completion))) \
35+
if (unlikely (ecma_is_completion_value_throw (var ## _completion))) \
3736
{ \
3837
return_value = var ## _completion; \
3938
} \

‎jerry-core/jerry-api.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
*/
3737
typedef enum
3838
{
39-
JERRY_COMPLETION_CODE_OK = 0, /**< successful completion */
40-
JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION = 1, /**< exception occured and it was not handled */
41-
JERRY_COMPLETION_CODE_FAILED_ASSERTION_IN_SCRIPT = 2 /**< assertion, performed by script, failed */
39+
JERRY_COMPLETION_CODE_OK = 0, /**< successful completion */
40+
JERRY_COMPLETION_CODE_UNHANDLED_EXCEPTION = 1, /**< exception occured and it was not handled */
4241
} jerry_completion_code_t;
4342

4443
/**

‎jerry-core/jerry.cpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,16 +1113,9 @@ jerry_api_eval (const char *source_p, /**< source code */
11131113
}
11141114
else
11151115
{
1116-
JERRY_ASSERT (ecma_is_completion_value_exit (completion));
1117-
1118-
if (ecma_is_value_true (ecma_get_completion_value_value (completion)))
1119-
{
1120-
status = JERRY_COMPLETION_CODE_OK;
1121-
}
1122-
else
1123-
{
1124-
status = JERRY_COMPLETION_CODE_FAILED_ASSERTION_IN_SCRIPT;
1125-
}
1116+
JERRY_ASSERT (ecma_is_completion_value_empty (completion));
1117+
1118+
status = JERRY_COMPLETION_CODE_OK;
11261119
}
11271120
}
11281121

‎jerry-core/parser/js/opcodes-dumper.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,12 +2599,6 @@ dump_retval (operand op)
25992599
dump_single_address (getop_retval, op);
26002600
}
26012601

2602-
void
2603-
dump_exit (void)
2604-
{
2605-
serializer_dump_op_meta (create_op_meta_000 (getop_exitval (0)));
2606-
}
2607-
26082602
void
26092603
dumper_init (void)
26102604
{

‎jerry-core/parser/js/opcodes-dumper.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,5 @@ void rewrite_reg_var_decl (void);
234234

235235
void dump_ret (void);
236236
void dump_retval (operand op);
237-
void dump_exit (void);
238237

239238
#endif /* OPCODES_DUMPER_H */

0 commit comments

Comments
 (0)