[libcxx-commits] [PATCH] D147680: [ASan][libc++] Turn on ASan annotations for short strings

[Tacet via Phabricator via libcxx-commits]

AdvenamTacet updated this revision to Diff 514108.
AdvenamTacet added a comment.

This update tries to fix the conflict problem.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D147680/new/

https://reviews.llvm.org/D147680

Files:
  libcxx/include/string


Index: libcxx/include/string
===================================================================
--- libcxx/include/string
+++ libcxx/include/string
@@ -617,7 +617,12 @@
 #else
 #  define _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS
 #endif
-#define _LIBCPP_SHORT_STRING_ANNOTATIONS_ALLOWED false
+#if (_LIBCPP_CLANG_VER >= 1600)
+// TODO LLVM18: Remove special casing or macro
+#  define _LIBCPP_SHORT_STRING_ANNOTATIONS_ALLOWED true
+#else
+#  define _LIBCPP_SHORT_STRING_ANNOTATIONS_ALLOWED false
+#endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D147680.514108.patch
Type: text/x-patch
Size: 534 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230417/ffe47a07/attachment.bin>