Skip to content

Commit 76f03e4

Browse files
committed
Fix LLVM/clang conversion errors
This fixes some conversion errors one gets when compiling with LLVM/clang. Most of them are caused when a bit-specific type (i.e. `uint16_t`) is implicitly cast to an `enum` of smaller value range. The fix is just an explicit casting of those types to the desired target type. JerryScript-DCO-1.0-Signed-off-by: Martine Lenders m.lenders@fu-berlin.de
1 parent a3112ab commit 76f03e4

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

jerry-core/ecma/builtin-objects/ecma-builtins.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,12 +735,12 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object *
735735
}
736736
case ECMA_BUILTIN_PROPERTY_STRING:
737737
{
738-
value = ecma_make_magic_string_value (curr_property_p->value);
738+
value = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->value);
739739
break;
740740
}
741741
case ECMA_BUILTIN_PROPERTY_OBJECT:
742742
{
743-
value = ecma_make_object_value (ecma_builtin_get (curr_property_p->value));
743+
value = ecma_make_object_value (ecma_builtin_get ((ecma_builtin_id_t) curr_property_p->value));
744744
break;
745745
}
746746
case ECMA_BUILTIN_PROPERTY_ROUTINE:
@@ -878,15 +878,15 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in
878878
index = 0;
879879
}
880880

881-
ecma_string_t *name_p = ecma_get_magic_string (curr_property_p->magic_string_id);
881+
ecma_string_t *name_p = ecma_get_magic_string ((lit_magic_string_id_t) curr_property_p->magic_string_id);
882882

883883
uint32_t bit_for_index = (uint32_t) 1u << index;
884884

885885
if (!(*bitset_p & bit_for_index) || ecma_op_object_has_own_property (object_p, name_p))
886886
{
887-
ecma_append_to_values_collection (for_non_enumerable_p,
888-
ecma_make_magic_string_value (curr_property_p->magic_string_id),
889-
0);
887+
ecma_value_t name = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->magic_string_id);
888+
889+
ecma_append_to_values_collection (for_non_enumerable_p, name, 0);
890890
}
891891

892892
ecma_deref_ecma_string (name_p);

jerry-core/ecma/operations/ecma-objects.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
17751775
case ECMA_OBJECT_TYPE_CLASS:
17761776
{
17771777
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
1778-
return ext_object_p->u.class_prop.class_id;
1778+
return (lit_magic_string_id_t) ext_object_p->u.class_prop.class_id;
17791779
}
17801780
case ECMA_OBJECT_TYPE_PSEUDO_ARRAY:
17811781
{
@@ -1787,7 +1787,7 @@ ecma_object_get_class_name (ecma_object_t *obj_p) /**< object */
17871787
case ECMA_PSEUDO_ARRAY_TYPEDARRAY:
17881788
case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO:
17891789
{
1790-
return ext_obj_p->u.pseudo_array.u1.class_id;
1790+
return (lit_magic_string_id_t) ext_obj_p->u.pseudo_array.u1.class_id;
17911791
}
17921792
#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
17931793
default:

jerry-core/ecma/operations/ecma-typedarray-object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ ecma_op_create_typedarray_with_type_and_length (ecma_object_t *obj_p, /**< Typed
916916
JERRY_ASSERT (ecma_is_typedarray (ecma_make_object_value (obj_p)));
917917

918918
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
919-
lit_magic_string_id_t class_id = ext_object_p->u.pseudo_array.u1.class_id;
919+
lit_magic_string_id_t class_id = (lit_magic_string_id_t) ext_object_p->u.pseudo_array.u1.class_id;
920920
ecma_object_t *proto_p;
921921
uint8_t element_size_shift = 0;
922922

jerry-core/lit/lit-magic-strings.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ lit_is_utf8_string_magic (const lit_utf8_byte_t *string_p, /**< utf-8 string */
204204
while (first < last)
205205
{
206206
lit_utf8_size_t middle = ((first + last) / 2); /**< mid point of search */
207-
int compare = memcmp (lit_get_magic_string_utf8 (middle), string_p, string_size);
207+
int compare = memcmp (lit_get_magic_string_utf8 ((lit_magic_string_id_t) middle), string_p, string_size);
208208

209209
if (compare == 0)
210210
{
@@ -249,7 +249,7 @@ lit_is_utf8_string_pair_magic (const lit_utf8_byte_t *string1_p, /**< first utf-
249249
while (first < last)
250250
{
251251
lit_utf8_size_t middle = ((first + last) / 2); /**< mid point of search */
252-
const lit_utf8_byte_t *middle_string_p = lit_get_magic_string_utf8 (middle);
252+
const lit_utf8_byte_t *middle_string_p = lit_get_magic_string_utf8 ((lit_magic_string_id_t) middle);
253253

254254
int compare = memcmp (middle_string_p, string1_p, string1_size);
255255

0 commit comments

Comments
 (0)