svn commit: r299700 - in head/contrib/jemalloc: . include/jemalloc/internal

[Jason Evans]

Author: jasone
Date: Fri May 13 21:18:10 2016
New Revision: 299700
URL: https://svnweb.freebsd.org/changeset/base/299700

Log:
  Work around invalid gcc warning (explicit cast apparently lost).

Modified:
  head/contrib/jemalloc/FREEBSD-diffs
  head/contrib/jemalloc/include/jemalloc/internal/arena.h

Modified: head/contrib/jemalloc/FREEBSD-diffs
==============================================================================
--- head/contrib/jemalloc/FREEBSD-diffs	Fri May 13 21:17:49 2016	(r299699)
+++ head/contrib/jemalloc/FREEBSD-diffs	Fri May 13 21:18:10 2016	(r299700)
@@ -46,6 +46,38 @@ index c4a44e3..4626e9b 100644
 +    in FreeBSD 11.0.</para>
 +  </refsect1>
  </refentry>
+diff --git a/include/jemalloc/internal/arena.h b/include/jemalloc/internal/arena.h
+index b1de2b6..da6b6d2 100644
+--- a/include/jemalloc/internal/arena.h
++++ b/include/jemalloc/internal/arena.h
+@@ -718,8 +718,13 @@ arena_miscelm_get_mutable(arena_chunk_t *chunk, size_t pageind)
+ JEMALLOC_ALWAYS_INLINE const arena_chunk_map_misc_t *
+ arena_miscelm_get_const(const arena_chunk_t *chunk, size_t pageind)
+ {
++#if 1 /* Work around gcc bug. */
++	arena_chunk_t *mchunk = (arena_chunk_t *)chunk;
+ 
++	return (arena_miscelm_get_mutable(mchunk, pageind));
++#else
+ 	return (arena_miscelm_get_mutable((arena_chunk_t *)chunk, pageind));
++#endif
+ }
+ 
+ JEMALLOC_ALWAYS_INLINE size_t
+@@ -778,8 +783,13 @@ arena_mapbitsp_get_mutable(arena_chunk_t *chunk, size_t pageind)
+ JEMALLOC_ALWAYS_INLINE const size_t *
+ arena_mapbitsp_get_const(const arena_chunk_t *chunk, size_t pageind)
+ {
++#if 1 /* Work around gcc bug. */
++	arena_chunk_t *mchunk = (arena_chunk_t *)chunk;
+ 
++	return (arena_mapbitsp_get_mutable(mchunk, pageind));
++#else
+ 	return (arena_mapbitsp_get_mutable((arena_chunk_t *)chunk, pageind));
++#endif
+ }
+ 
+ JEMALLOC_ALWAYS_INLINE size_t
 diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
 index 51bf897..7de22ea 100644
 --- a/include/jemalloc/internal/jemalloc_internal.h.in

Modified: head/contrib/jemalloc/include/jemalloc/internal/arena.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/arena.h	Fri May 13 21:17:49 2016	(r299699)
+++ head/contrib/jemalloc/include/jemalloc/internal/arena.h	Fri May 13 21:18:10 2016	(r299700)
@@ -718,8 +718,13 @@ arena_miscelm_get_mutable(arena_chunk_t 
 JEMALLOC_ALWAYS_INLINE const arena_chunk_map_misc_t *
 arena_miscelm_get_const(const arena_chunk_t *chunk, size_t pageind)
 {
+#if 1 /* Work around gcc bug. */
+	arena_chunk_t *mchunk = (arena_chunk_t *)chunk;
 
+	return (arena_miscelm_get_mutable(mchunk, pageind));
+#else
 	return (arena_miscelm_get_mutable((arena_chunk_t *)chunk, pageind));
+#endif
 }
 
 JEMALLOC_ALWAYS_INLINE size_t
@@ -778,8 +783,13 @@ arena_mapbitsp_get_mutable(arena_chunk_t
 JEMALLOC_ALWAYS_INLINE const size_t *
 arena_mapbitsp_get_const(const arena_chunk_t *chunk, size_t pageind)
 {
+#if 1 /* Work around gcc bug. */
+	arena_chunk_t *mchunk = (arena_chunk_t *)chunk;
 
+	return (arena_mapbitsp_get_mutable(mchunk, pageind));
+#else
 	return (arena_mapbitsp_get_mutable((arena_chunk_t *)chunk, pageind));
+#endif
 }
 
 JEMALLOC_ALWAYS_INLINE size_t