Fix build failure caused by clang version 11.1.0 in Linux (microsoft#…

…4191) Add `HAVE_MALLINFO2` flag and use `mallinfo2` instead of `mallinfo` when `HAVE_MALLINFO2` flag is enabled.
jaebaek · Jan 18, 2022 · 46c9735 · 46c9735
1 parent 0917aa9
commit 46c9735
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
@@ -150,6 +150,7 @@ if( HAVE_SYS_UIO_H )
 endif()
 check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)
 check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
+check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2)
 check_symbol_exists(malloc_zone_statistics malloc/malloc.h
                     HAVE_MALLOC_ZONE_STATISTICS)
 check_symbol_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP)

diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
@@ -171,6 +171,9 @@
 /* Define if mallinfo() is available on this platform. */
 #cmakedefine HAVE_MALLINFO ${HAVE_MALLINFO}
 
+/* Define if mallinfo2() is available on this platform. */
+#cmakedefine HAVE_MALLINFO2 ${HAVE_MALLINFO2}
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #cmakedefine HAVE_MALLOC_H ${HAVE_MALLOC_H}
 

diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
@@ -174,6 +174,9 @@
 /* Define if mallinfo() is available on this platform. */
 #undef HAVE_MALLINFO
 
+/* Define if mallinfo() is available on this platform. */
+#undef HAVE_MALLINFO2
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 

diff --git a/lib/Support/Unix/Process.inc b/lib/Support/Unix/Process.inc
@@ -93,7 +93,11 @@ unsigned Process::getPageSize() {
 }
 
 size_t Process::GetMallocUsage() {
-#if defined(HAVE_MALLINFO)
+#if defined(HAVE_MALLINFO2)
+  struct mallinfo2 mi;
+  mi = ::mallinfo2();
+  return mi.uordblks;
+#elif defined(HAVE_MALLINFO)
   struct mallinfo mi;
   mi = ::mallinfo();
   return mi.uordblks;