* internal.h: do not use ruby_sized_xrealloc() and ruby_sized_xfree()

  if HAVE_MALLOC_USABLE_SIZE (or _WIN32) is defined.
  We don't need these function if malloc_usable_size() is available.
* gc.c: catch up this change.
* gc.c: define HAVE_MALLOC_USABLE_SIZE on _WIN32.
* array.c (ary_resize_capa): do not use ruby_sized_xfree() with
  local variable to avoid "unused local variable" warning.
  This change only has few impact.
* string.c (rb_str_resize): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 32 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7020c9b835..a1947ecb53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Mon Nov 25 06:53:30 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h: do not use ruby_sized_xrealloc() and ruby_sized_xfree()
+	  if HAVE_MALLOC_USABLE_SIZE (or _WIN32) is defined.
+
+	  We don't need these function if malloc_usable_size() is available.
+
+	* gc.c: catch up this change.
+
+	* gc.c: define HAVE_MALLOC_USABLE_SIZE on _WIN32.
+
+	* array.c (ary_resize_capa): do not use ruby_sized_xfree() with
+	  local variable to avoid "unused local variable" warning.
+	  This change only has few impact.
+
+	* string.c (rb_str_resize): ditto.
+
 Mon Nov 25 05:05:04 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* test/-ext-/tracepoint/test_tracepoint.rb: catch up GC.stat changes
diff --git a/array.c b/array.c
index 5d01fdb551..baf6118a18 100644
--- a/array.c
+++ b/array.c
@@ -219,13 +219,12 @@ ary_resize_capa(VALUE ary, long capacity)
         if (!ARY_EMBED_P(ary)) {
             long len = RARRAY_LEN(ary);
 	    const VALUE *ptr = RARRAY_CONST_PTR(ary);
-	    size_t size = ARY_HEAP_SIZE(ary);
 
 	    if (len > capacity) len = capacity;
             MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len);
             FL_SET_EMBED(ary);
             ARY_SET_LEN(ary, len);
-	    ruby_sized_xfree((VALUE *)ptr, size);
+	    ruby_xfree((VALUE *)ptr);
         }
     }
 }
diff --git a/gc.c b/gc.c
index fa073451dd..f5ef4cfa3e 100644
--- a/gc.c
+++ b/gc.c
@@ -37,6 +37,7 @@
 
 #ifndef HAVE_MALLOC_USABLE_SIZE
 # ifdef _WIN32
+#   define HAVE_MALLOC_USABLE_SIZE
 #   define malloc_usable_size(a) _msize(a)
 # endif
 #else
@@ -5753,6 +5754,9 @@ ruby_xcalloc(size_t n, size_t size)
     return vm_xcalloc(&rb_objspace, n, size);
 }
 
+#ifdef ruby_sized_xrealloc
+#undef ruby_sized_xrealloc
+#endif
 void *
 ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size)
 {
@@ -5775,6 +5779,9 @@ ruby_xrealloc2(void *ptr, size_t n, size_t size)
     return ruby_xrealloc(ptr, len);
 }
 
+#ifdef ruby_sized_xfree
+#undef ruby_sized_xfree
+#endif
 void
 ruby_sized_xfree(void *x, size_t size)
 {
diff --git a/internal.h b/internal.h
index 963192d27b..289561306b 100644
--- a/internal.h
+++ b/internal.h
@@ -439,9 +439,15 @@ void rb_objspace_set_event_hook(const rb_event_flag_t event);
 void rb_gc_writebarrier_remember_promoted(VALUE obj);
 void ruby_gc_set_params(void);
 
+#if HAVE_MALLOC_USABLE_SIZE || defined(_WIN32)
+#define ruby_sized_xrealloc(ptr, new_size, old_size) ruby_xrealloc(ptr, new_size)
+#define ruby_sized_xfree(ptr, size) ruby_xfree(ptr)
+#define SIZED_REALLOC_N(var,type,n,old_n) REALLOC_N(var, type, n)
+#else
 void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_ALLOC_SIZE((2));
 void ruby_sized_xfree(void *x, size_t size);
 #define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc((char*)(var), (n) * sizeof(type), (old_n) * sizeof(type)))
+#endif
 
 void rb_gc_resurrect(VALUE ptr);
 
diff --git a/string.c b/string.c
index 4114f2d8b5..80b87aa9af 100644
--- a/string.c
+++ b/string.c
@@ -1973,13 +1973,12 @@ rb_str_resize(VALUE str, long len)
 	}
 	else if (len + termlen <= RSTRING_EMBED_LEN_MAX + 1) {
 	    char *ptr = STR_HEAP_PTR(str);
-	    size_t size = STR_HEAP_SIZE(str);
 	    STR_SET_EMBED(str);
 	    if (slen > len) slen = len;
 	    if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, slen);
 	    TERM_FILL(RSTRING(str)->as.ary + len, termlen);
 	    STR_SET_EMBED_LEN(str, len);
-	    if (independent) ruby_sized_xfree(ptr, size);
+	    if (independent) ruby_xfree(ptr);
 	    return str;
 	}
 	else if (!independent) {