[libc++] Unchanged behavior for a deque with elements of const type

[AdvenamTacet]

Summary

This patch adds const to a few places, to make std::deque<const T> work as before D132092.
It makes compilation backward compatible.

Deque does not support const objects (objects have to be movable), so correct C++ code works with and without this patch, but there is no point in changing the behavior for incorrect code in D132092.

[AdvenamTacet]

Because D132092 got reverted, I will include that change there.

libcxx/include/deque

#endif // !defined(_LIBCPP_HAS_NO_ASAN) && _LIBCPP_CLANG_VER >= 1600
     }
 
     _LIBCPP_HIDE_FROM_ABI
     void __annotate_whole_block(size_t __block_index, __asan_annotation_type __annotation_type, __asan_annotation_place __place) {
         __annotate_from_to(__block_index * __block_size, (__block_index + 1) * __block_size, __annotation_type, __place);
     }
 
     _LIBCPP_HIDE_FROM_ABI
-    void __annotate_poison_block(void *__beginning, void *__end) {
+    void __annotate_poison_block(const void *__beginning, const void *__end) {
         __annotate_double_ended_contiguous_container(__beginning, __end, __beginning, __end, __end, __end);
     }
 
 #if !defined(_LIBCPP_HAS_NO_ASAN)
 
   public:
     _LIBCPP_HIDE_FROM_ABI
     bool __verify_asan_annotations() const _NOEXCEPT {
bool __verify_asan_annotations() const _NOEXCEPT {
         }
 
         size_type __end                           = __start_ + size();
         __map_const_iterator __first_mp = __map_.begin() + __start_ / __block_size;
         __map_const_iterator __last_mp  = __map_.begin() + (__end - 1) / __block_size;
 
         // Pointers to first and after last elements
         // Those can be in different deque blocks
-        void* __p_beg = std::__to_address(*__first_mp + (__start_ % __block_size));
-        void* __p_end =
+        const void* __p_beg = std::__to_address(*__first_mp + (__start_ % __block_size));
+        const void* __p_end =
             std::__to_address(*__last_mp + ((__end % __block_size == 0) ? __block_size : __end % __block_size));
 
         for (__map_const_iterator __it = __map_.begin(); __it != __map_.end(); ++__it) {
             // Go over all blocks, find the place we are in and verify its annotations
             // Note that __p_end points *behind* the last item.
 
             // - blocks before the first block with container elements
             // - first block with items
             // - last block with items
             // - blocks after last block with ciontainer elements
 
             // Is the block before or after deque blocks that contain elements?
             if (__it < __first_mp || __it > __last_mp) {
                 if (!__sanitizer_verify_double_ended_contiguous_container(
                         std::__to_address(*__it),
                         std::__to_address(*__it),
                         std::__to_address(*__it),
                         std::__to_address(*__it + __block_size)))
                   return false;
             } else {
-                void* __containers_buffer_beg = (__it == __first_mp) ? __p_beg : (void*)std::__to_address(*__it);
-                void* __containers_buffer_end =
-                    (__it == __last_mp) ? __p_end : (void*)std::__to_address(*__it + __block_size);
+                const void* __containers_buffer_beg = (__it == __first_mp) ? __p_beg : (const void*)std::__to_address(*__it);
+                const void* __containers_buffer_end =
+                    (__it == __last_mp) ? __p_end : (const void*)std::__to_address(*__it + __block_size);
                 if (!__sanitizer_verify_double_ended_contiguous_container(
                         std::__to_address(*__it),
                         __containers_buffer_beg,
                         __containers_buffer_end,
                         std::__to_address(*__it + __block_size))) {
                   return false;
                 }
             }