commit 2e717b451766f2579d302033152fc6fa58a4f098
author Louis Dionne <ldionne.2@gmail.com> Tue Dec 01 17:43:33 2020 -0500
committer Copybara-Service <copybara-worker@google.com> Tue Dec 08 16:53:44 2020 -0800
tree 9785846b23e3cf622143cf01ed673848e5a5a7ab
parent aca0be25845716b0d015d75f22306622be62221e

[libc++abi] Don't try calling __libcpp_aligned_free when aligned allocation is disabled

See https://reviews.llvm.org/rGa78aaa1ad512#962077 for details.

GitOrigin-RevId: d67e58f23a8232ee17dba3cd8c5b4c1378ddbc59

src/fallback_malloc.cpp

diff --git a/src/fallback_malloc.cpp b/src/fallback_malloc.cpp
index 7872018..f3d7937 100644
--- a/src/fallback_malloc.cpp
+++ b/src/fallback_malloc.cpp
@@ -234,7 +234,11 @@
   if (is_fallback_ptr(ptr))
     fallback_free(ptr);
   else {
+#if defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION)
+    ::free(ptr);
+#else
     std::__libcpp_aligned_free(ptr);
+#endif
   }
 }