diff --git a/libcxx/include/string b/libcxx/include/string
--- a/libcxx/include/string
+++ b/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