archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix compilation with MALLOC_ALLOCATED_SIZE

Browse source 
Previously compilation failed with -DMALLOC_ALLOCATED_SIZE=1

Co-authored-by: Matthew Draper <matthew@trebex.net>
This commit is contained in:
John Hawthorn 2024-12-11 14:32:43 -08:00
parent 9181e8bc87
commit 36f49eb2b4
Notes: git 2024-12-12 00:58:52 +00:00
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gc/default/default.c
View file

@ -8037,9 +8037,9 @@ objspace_malloc_increase_body(rb_objspace_t *objspace, void *mem, size_t new_siz
} }
else { else {
size_t dec_size = old_size - new_size; size_t dec_size = old_size - new_size;
size_t allocated_size = objspace->malloc_params.allocated_size;
#if MALLOC_ALLOCATED_SIZE_CHECK #if MALLOC_ALLOCATED_SIZE_CHECK
size_t allocated_size = objspace->malloc_params.allocated_size;
if (allocated_size < dec_size) { if (allocated_size < dec_size) {
rb_bug("objspace_malloc_increase: underflow malloc_params.allocated_size."); rb_bug("objspace_malloc_increase: underflow malloc_params.allocated_size.");
} }
@ -9286,7 +9286,8 @@ rb_gc_impl_objspace_free(void *objspace_ptr)
static VALUE static VALUE
gc_malloc_allocated_size(VALUE self) gc_malloc_allocated_size(VALUE self)
{ {
return UINT2NUM(rb_objspace.malloc_params.allocated_size); rb_objspace_t *objspace = (rb_objspace_t *)rb_gc_get_objspace();
return ULL2NUM(objspace->malloc_params.allocated_size);
} }
/* /*
@ -9301,7 +9302,8 @@ gc_malloc_allocated_size(VALUE self)
static VALUE static VALUE
gc_malloc_allocations(VALUE self) gc_malloc_allocations(VALUE self)
{ {
return UINT2NUM(rb_objspace.malloc_params.allocations); rb_objspace_t *objspace = (rb_objspace_t *)rb_gc_get_objspace();
return ULL2NUM(objspace->malloc_params.allocations);
} }
#endif #endif