YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revise the usage of the global error value/exception flag (#3426)

Browse Source 
This patch also fixes #3422.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2019-12-10 14:42:10 +01:00
committed by Zoltan Herczeg
parent 7c0b1ca88a
commit 9b33fc8cbd
28 changed files with 238 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-lexer.c
+4 -6
View File
@@ -2433,16 +2433,14 @@ lexer_construct_regexp_object (parser_context_t *context_p, /**< context */
current_flags);
ecma_deref_ecma_string (pattern_str_p);
bool is_throw = ECMA_IS_VALUE_ERROR (completion_value) != 0;
ecma_free_value (completion_value);
if (is_throw)
if (ECMA_IS_VALUE_ERROR (completion_value))
{
ecma_free_value (JERRY_CONTEXT (error_value));
jcontext_release_exception ();
parser_raise_error (context_p, PARSER_ERR_INVALID_REGEXP);
}
ecma_free_value (completion_value);
literal_p->type = LEXER_REGEXP_LITERAL;
literal_p->u.bytecode_p = (ecma_compiled_code_t *) re_bytecode_p;
jerry-core/parser/js/js-parser.c
+1 -2
View File
@@ -2542,8 +2542,7 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */
{
/* It is unlikely that memory can be allocated in an out-of-memory
* situation. However, a simple value can still be thrown. */
JERRY_CONTEXT (error_value) = ECMA_VALUE_NULL;
JERRY_CONTEXT (status_flags) |= ECMA_STATUS_EXCEPTION;
jcontext_raise_exception (ECMA_VALUE_NULL);
return ECMA_VALUE_ERROR;
}
#if ENABLED (JERRY_ERROR_MESSAGES)
jerry-core/parser/regexp/re-parser.c
+2 -2
View File
@@ -656,7 +656,7 @@ re_parse_next_token (re_parser_ctx_t *parser_ctx_p, /**< RegExp parser context *
}
JERRY_ASSERT (ECMA_IS_VALUE_ERROR (ret_value));
ecma_free_value (JERRY_CONTEXT (error_value));
jcontext_release_exception ();
parser_ctx_p->input_curr_p = input_curr_p;
/* It was not an iterator, continue the parsing. */
@@ -682,7 +682,7 @@ re_parse_next_token (re_parser_ctx_t *parser_ctx_p, /**< RegExp parser context *
if (!ecma_is_value_empty (ret_value))
{
ecma_free_value (JERRY_CONTEXT (error_value));
jcontext_release_exception ();
parser_ctx_p->input_curr_p = input_curr_p;
ret_value = ECMA_VALUE_EMPTY;
}