diff options
| author |  Derek Mauro <dmauro@google.com> | 2022-06-06 07:43:30 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-worker@google.com> | 2022-06-06 07:44:19 -0700 |
| commit | 9cdb98e73118f0485fdf5fadcb3e57ab852e65a1 (patch) | |
| tree | 2377b06a10f1af097e71797fc630ef37418bec50 | |
| parent | 47345f63b94a0ea8fbfb3c49ed5b185f2b649f1a (diff) | |
InlinedVector: Limit the scope of the maybe-uninitialized warning suppression
Due to changes in GCC 12, without this change, the warning fires
PiperOrigin-RevId: 453197246
Change-Id: I2e31cbff1707ab09868cf77dcf040b033984e654
| -rw-r--r-- | absl/container/inlined_vector.h | 12 | ||||
| -rw-r--r-- | absl/container/internal/inlined_vector.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 711b29c1..bc1c4a77 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -585,8 +585,20 @@ class InlinedVector { if (ABSL_PREDICT_TRUE(n != 0)) { value_type dealias = v; + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102329#c2 + // It appears that GCC thinks that since `pos` is a const pointer and may + // point to uninitialized memory at this point, a warning should be + // issued. But `pos` is actually only used to compute an array index to + // write to. +#if !defined(__clang__) && defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif return storage_.Insert(pos, CopyValueAdapter<A>(std::addressof(dealias)), n); +#if !defined(__clang__) && defined(__GNUC__) +#pragma GCC diagnostic pop +#endif } else { return const_cast<iterator>(pos); } diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h index 2baf26f3..bc1b8c1b 100644 --- a/absl/container/internal/inlined_vector.h +++ b/absl/container/internal/inlined_vector.h @@ -40,7 +40,6 @@ namespace inlined_vector_internal { #if !defined(__clang__) && defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Warray-bounds" -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif template <typename A> @@ -942,7 +941,7 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void { swap(GetAllocator(), other_storage_ptr->GetAllocator()); } -// End ignore "array-bounds" and "maybe-uninitialized" +// End ignore "array-bounds" #if !defined(__clang__) && defined(__GNUC__) #pragma GCC diagnostic pop #endif |