1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicitly cast to uint32_t and suppress warnings by VC

Browse Source 
```
../src/variable.c(1440): warning C4244: 'initializing': conversion from 'double' to 'uint32_t', possible loss of data
242
../src/variable.c(1470): warning C4244: 'initializing': conversion from 'double' to 'uint32_t', possible loss of data
243
```

TODO: check for `newsize` overflow
This commit is contained in:
Nobuyoshi Nakada 2022-10-16 00:20:58 +09:00
parent 7fcad1fa03
commit 1e3fa634f7
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
variable.c
View File

@ -1434,10 +1434,11 @@ rb_ensure_generic_iv_list_size(VALUE obj, uint32_t newsize)
return ivtbl; return ivtbl;
} }
// @note May raise when there are too many instance variables.
void void
rb_init_iv_list(VALUE obj) rb_init_iv_list(VALUE obj)
{ {
uint32_t newsize = rb_shape_get_shape(obj)->iv_count * 2.0; uint32_t newsize = (uint32_t)(rb_shape_get_shape(obj)->iv_count * 2.0);
uint32_t len = ROBJECT_NUMIV(obj); uint32_t len = ROBJECT_NUMIV(obj);
rb_ensure_iv_list_size(obj, len, newsize < len ? len : newsize); rb_ensure_iv_list_size(obj, len, newsize < len ? len : newsize);
} }
@ -1467,7 +1468,7 @@ rb_obj_ensure_iv_index_mapping(VALUE obj, ID id)
uint32_t len = ROBJECT_NUMIV(obj); uint32_t len = ROBJECT_NUMIV(obj);
if (len <= index) { if (len <= index) {
uint32_t newsize = (shape->iv_count + 1) * 1.25; uint32_t newsize = (uint32_t)((shape->iv_count + 1) * 1.25);
rb_ensure_iv_list_size(obj, len, newsize); rb_ensure_iv_list_size(obj, len, newsize);
} }
RUBY_ASSERT(index <= ROBJECT_NUMIV(obj)); RUBY_ASSERT(index <= ROBJECT_NUMIV(obj));