diff options
| author |   Louis Dionne <ldionne.2@gmail.com> | 2020-12-01 17:43:33 -0500 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2020-12-01 17:45:14 -0500 |
| commit | d67e58f23a8232ee17dba3cd8c5b4c1378ddbc59 (patch) | |
| tree | 70f3f0e21f6299030d8aa7d8e203a7d26b6c294f | |
| parent | [ms] [llvm-ml] Introduce command-line compatibility for ml.exe and ml64.exe (diff) | |
| download | llvm-project-d67e58f23a8232ee17dba3cd8c5b4c1378ddbc59.tar.gz llvm-project-d67e58f23a8232ee17dba3cd8c5b4c1378ddbc59.tar.bz2 llvm-project-d67e58f23a8232ee17dba3cd8c5b4c1378ddbc59.zip | |
[libc++abi] Don't try calling __libcpp_aligned_free when aligned allocation is disabled
See https://reviews.llvm.org/rGa78aaa1ad512#962077 for details.
| -rw-r--r-- | libcxxabi/src/fallback_malloc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp index 78720187affc..f3d7937793ce 100644 --- a/libcxxabi/src/fallback_malloc.cpp +++ b/libcxxabi/src/fallback_malloc.cpp @@ -234,7 +234,11 @@ void __aligned_free_with_fallback(void* ptr) { 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 } } |