Eliminate 'GC_non_gc_bytes is deprecated' warning in new_gc_alloc.h

* include/new_gc_alloc.h (GC_out_of_line_malloc): Define and use
non_gc_bytes local variable; replace read and store of GC_non_gc_bytes
directly to GC_get_non_gc_bytes() and GC_set_non_gc_bytes() calls.

1 files changed, 4 insertions, 3 deletions

diff --git a/include/new_gc_alloc.h b/include/new_gc_alloc.h
index 3e8a38ef..7ff2a0b3 100644
--- a/include/new_gc_alloc.h
+++ b/include/new_gc_alloc.h
@@ -155,14 +155,15 @@ void * GC_aux_template<dummy>::GC_out_of_line_malloc(size_t nwords, int kind)
     if (0 == op)
         GC_ALLOCATOR_THROW_OR_ABORT();
 
+    GC_word non_gc_bytes = GC_get_non_gc_bytes();
     GC_bytes_recently_allocd += GC_uncollectable_bytes_recently_allocd;
-    GC_non_gc_bytes +=
-                GC_uncollectable_bytes_recently_allocd;
+    non_gc_bytes += GC_uncollectable_bytes_recently_allocd;
     GC_uncollectable_bytes_recently_allocd = 0;
 
     GC_bytes_recently_freed += GC_uncollectable_bytes_recently_freed;
-    GC_non_gc_bytes -= GC_uncollectable_bytes_recently_freed;
+    non_gc_bytes -= GC_uncollectable_bytes_recently_freed;
     GC_uncollectable_bytes_recently_freed = 0;
+    GC_set_non_gc_bytes(non_gc_bytes);
 
     GC_incr_bytes_allocd(GC_bytes_recently_allocd);
     GC_bytes_recently_allocd = 0;