archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Append promise reaction values in a gc safe manner (#4127)

Browse Source 
Fixes #4096.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai daniel.batyai@h-lab.eu
This commit is contained in:
Dániel Bátyai 2020-08-12 20:45:07 +02:00 committed by GitHub
parent cd34bfa4c3
commit 79540727ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jerry-core/ecma/operations/ecma-promise-object.c
View File

@ -856,30 +856,28 @@ ecma_promise_do_then (ecma_value_t promise, /**< the promise which call 'then' *
if (flags & ECMA_PROMISE_IS_PENDING)
{
/* 7. */
ecma_value_t capability_with_tag;
ECMA_SET_NON_NULL_POINTER_TAG (capability_with_tag, result_capability_obj_p, 0);
/* [ capability, (on_fulfilled), (on_rejected) ] */
ecma_value_t reaction_values[3];
ecma_value_t *reactions_p = reaction_values + 1;
uint8_t tag = 0;
if (on_fulfilled != ECMA_VALUE_TRUE)
{
ECMA_SET_FIRST_BIT_TO_POINTER_TAG (capability_with_tag);
tag |= JMEM_FIRST_TAG_BIT_MASK;
*reactions_p++ = on_fulfilled;
}
if (on_rejected != ECMA_VALUE_FALSE)
{
ECMA_SET_SECOND_BIT_TO_POINTER_TAG (capability_with_tag);
tag |= JMEM_SECOND_TAG_BIT_MASK;
*reactions_p++ = on_rejected;
}
ecma_collection_push_back (promise_p->reactions, capability_with_tag);
ECMA_SET_NON_NULL_POINTER_TAG (reaction_values[0], result_capability_obj_p, tag);
if (on_fulfilled != ECMA_VALUE_TRUE)
{
ecma_collection_push_back (promise_p->reactions, on_fulfilled);
}
if (on_rejected != ECMA_VALUE_FALSE)
{
ecma_collection_push_back (promise_p->reactions, on_rejected);
}
uint32_t value_count = (uint32_t) (reactions_p - reaction_values);
ecma_collection_append (promise_p->reactions, reaction_values, value_count);
}
else if (flags & ECMA_PROMISE_IS_FULFILLED)
{