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

Fix comparison of signed and unsigned integers

Browse Source 
```
../string.c:660:38: warning: comparison of integers of different signs: 'rb_atomic_t' (aka 'unsigned int') and 'int' [-Wsign-compare]
  660 |             RUBY_ASSERT(table->count < table->capacity / 2);
```
This commit is contained in:
Jean Boussier 2025-04-23 16:11:02 +02:00
parent 7d7478c7bc
commit 1f090403e2
Notes: git 2025-04-23 16:35:32 +00:00 
Merged: https://github.com/ruby/ruby/pull/13160
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
string.c
View File

@ -534,8 +534,8 @@ struct fstring_table_entry {
struct fstring_table_struct { struct fstring_table_struct {
struct fstring_table_entry *entries; struct fstring_table_entry *entries;
int capacity; unsigned int capacity;
int deleted_entries; unsigned int deleted_entries;
rb_atomic_t count; // TODO: pad to own cache line? rb_atomic_t count; // TODO: pad to own cache line?
}; };
@ -757,7 +757,7 @@ fstring_find_or_insert(VALUE hash_code, VALUE value, struct fstr_update_arg *arg
inserting = true; inserting = true;
} }
int prev_count = RUBY_ATOMIC_FETCH_ADD(table->count, 1); unsigned int prev_count = RUBY_ATOMIC_FETCH_ADD(table->count, 1);
if (UNLIKELY(prev_count > table->capacity / 2)) { if (UNLIKELY(prev_count > table->capacity / 2)) {
fstring_try_resize(table_obj); fstring_try_resize(table_obj);
@ -891,7 +891,7 @@ rb_fstring_foreach_with_replace(st_foreach_check_callback_func *func, st_update_
} }
struct fstring_table_struct *table = RTYPEDDATA_GET_DATA(table_obj); struct fstring_table_struct *table = RTYPEDDATA_GET_DATA(table_obj);
for (int i = 0; i < table->capacity; i++) { for (unsigned int i = 0; i < table->capacity; i++) {
VALUE key = table->entries[i].str; VALUE key = table->entries[i].str;
if(key == FSTRING_TABLE_EMPTY) continue; if(key == FSTRING_TABLE_EMPTY) continue;
if(key == FSTRING_TABLE_TOMBSTONE) continue; if(key == FSTRING_TABLE_TOMBSTONE) continue;
@ -12987,7 +12987,7 @@ Init_String(void)
{ {
rb_cString = rb_define_class("String", rb_cObject); rb_cString = rb_define_class("String", rb_cObject);
struct fstring_table_struct *fstring_table = RTYPEDDATA_GET_DATA(fstring_table_obj); struct fstring_table_struct *fstring_table = RTYPEDDATA_GET_DATA(fstring_table_obj);
for (int i = 0; i < fstring_table->capacity; i++) { for (unsigned int i = 0; i < fstring_table->capacity; i++) {
VALUE str = fstring_table->entries[i].str; VALUE str = fstring_table->entries[i].str;
if (!str) continue; if (!str) continue;
RBASIC_SET_CLASS(str, rb_cString); RBASIC_SET_CLASS(str, rb_cString);