Merge branch 'factor:master' into feature-vm-prepare-image-reserved-fields

[factor.git] / vm / allot.hpp

diff --git a/vm/allot.hpp b/vm/allot.hpp
index 1987b2b0e4f463f8b35350406541bad4b941ff8f..97fdd03222b47553294e0bf47a8e02e0e2795d15 100644 (file)
--- a/vm/allot.hpp
+++ b/vm/allot.hpp
@@ -64,18 +64,18 @@ inline object* factor_vm::allot_large_object(cell type, cell size) {
 inline object* factor_vm::allot_object(cell type, cell size) {
   FACTOR_ASSERT(!current_gc);
 
-  bump_allocator *nursery = data->nursery;
+  bump_allocator *data_nursery = data->nursery;
 
   // If the object is bigger than the nursery, allocate it in tenured space
-  if (size >= nursery->size)
+  if (size >= data_nursery->size)
     return allot_large_object(type, size);
 
   // If the object is smaller than the nursery, allocate it in the nursery,
   // after a GC if needed
-  if (nursery->here + size > nursery->end)
+  if (data_nursery->here + size > data_nursery->end)
     primitive_minor_gc();
 
-  object* obj = nursery->allot(size);
+  object* obj = data_nursery->allot(size);
   obj->initialize(type);
 
   return obj;