diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index 9c936d9..c45cf7e 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -38,7 +38,6 @@ #include "absl/base/call_once.h" #include "absl/base/casts.h" #include "absl/base/const_init.h" -#include "absl/base/dynamic_annotations.h" #include "absl/base/optimization.h" #include "absl/base/thread_annotations.h" #include "absl/cleanup/cleanup.h" diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index fc3a06f..2429974 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -34,7 +34,6 @@ #include #include "absl/base/attributes.h" -#include "absl/base/dynamic_annotations.h" #include "absl/base/macros.h" #include "absl/base/no_destructor.h" #include "absl/base/optimization.h" @@ -646,8 +645,8 @@ class ABSL_ATTRIBUTE_WARN_UNUSED PROTOBUF_DECLSPEC_EMPTY_BASES [[maybe_unused]] const bool is_soo = this->is_soo(); [[maybe_unused]] const Element* elem = reinterpret_cast(soo_rep_.elements(is_soo)); - ABSL_ANNOTATE_CONTIGUOUS_CONTAINER(elem, elem + Capacity(is_soo), - elem + old_size, elem + new_size); + // ABSL_ANNOTATE_CONTIGUOUS_CONTAINER(elem, elem + Capacity(is_soo), + // elem + old_size, elem + new_size); if (new_size < old_size) { ABSL_ANNOTATE_MEMORY_IS_UNINITIALIZED( elem + new_size, (old_size - new_size) * sizeof(Element));