Export of internal Abseil changes.

--
a874475e842d2adeb31bb7bd37bdd6eb15a2aeb9 by Mark Barolak <mbar@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 256414250

--
c95e6c21944c59c9b9b9e7eb9dc79cfb9ae5ef8d by CJ Johnson <johnsoncj@google.com>:

Update the license year + run clang-format for the FixedArray and InlinedVector test files

PiperOrigin-RevId: 256376285

--
f430b04f332d6b89cb8447b07217e391e1c38000 by Derek Mauro <dmauro@google.com>:

Migrate the Linux CMake tests from GCC 4.8 to the GCC latest
version. This will allow us to delete the GCC 4.8 test since that is
currently our only CMake coverage. This also means that we don't have
to update the script every time we move to a new minumum GCC version.

This change includes a fix for a -Wstringops-truncation warning in
symbolize_test.cc that triggers when it is built in release mode with
the latest GCC.

PiperOrigin-RevId: 256370092
GitOrigin-RevId: a874475e842d2adeb31bb7bd37bdd6eb15a2aeb9
Change-Id: Ia2ec58f9b9dfc382d043344e346cb397b802270a
This commit is contained in:
Abseil Team 2019-07-03 12:13:04 -07:00 committed by Mark Barolak
parent e6b050212c
commit 74d91756c1
475 changed files with 135 additions and 83 deletions

View file

@ -1,4 +1,4 @@
// Copyright 2017 The Abseil Authors. // Copyright 2019 The Abseil Authors.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "absl/container/fixed_array.h"
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
#include "benchmark/benchmark.h" #include "benchmark/benchmark.h"
#include "absl/container/fixed_array.h"
namespace { namespace {
@ -27,6 +27,7 @@ class SimpleClass {
public: public:
SimpleClass() : i(3) {} SimpleClass() : i(3) {}
~SimpleClass() { i = 0; } ~SimpleClass() { i = 0; }
private: private:
int i; int i;
}; };

View file

@ -1,4 +1,4 @@
// Copyright 2017 The Abseil Authors. // Copyright 2019 The Abseil Authors.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@ -14,10 +14,9 @@
#include <initializer_list> #include <initializer_list>
#include "absl/container/fixed_array.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "absl/base/internal/exception_safety_testing.h" #include "absl/base/internal/exception_safety_testing.h"
#include "absl/container/fixed_array.h"
namespace absl { namespace absl {

View file

@ -1,4 +1,4 @@
// Copyright 2017 The Abseil Authors. // Copyright 2019 The Abseil Authors.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@ -15,6 +15,7 @@
#include "absl/container/fixed_array.h" #include "absl/container/fixed_array.h"
#include <stdio.h> #include <stdio.h>
#include <cstring> #include <cstring>
#include <list> #include <list>
#include <memory> #include <memory>
@ -42,11 +43,7 @@ static bool IsOnStack(const ArrayType& a) {
class ConstructionTester { class ConstructionTester {
public: public:
ConstructionTester() ConstructionTester() : self_ptr_(this), value_(0) { constructions++; }
: self_ptr_(this),
value_(0) {
constructions++;
}
~ConstructionTester() { ~ConstructionTester() {
assert(self_ptr_ == this); assert(self_ptr_ == this);
self_ptr_ = nullptr; self_ptr_ = nullptr;
@ -58,9 +55,7 @@ class ConstructionTester {
static int constructions; static int constructions;
static int destructions; static int destructions;
void CheckConstructed() { void CheckConstructed() { assert(self_ptr_ == this); }
assert(self_ptr_ == this);
}
void set(int value) { value_ = value; } void set(int value) { value_ = value; }
int get() { return value_; } int get() { return value_; }
@ -329,8 +324,7 @@ static void TestArrayOfArrays(int n) {
} }
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
for (int j = 0; j < elements_per_inner_array; j++) { for (int j = 0; j < elements_per_inner_array; j++) {
ASSERT_EQ((array[i])[j].get(), ASSERT_EQ((array[i])[j].get(), (i + 1) * elements_per_inner_array + j);
(i + 1) * elements_per_inner_array + j);
ASSERT_EQ((array.data()[i])[j].get(), ASSERT_EQ((array.data()[i])[j].get(),
(i + 1) * elements_per_inner_array + j); (i + 1) * elements_per_inner_array + j);
} }
@ -363,8 +357,8 @@ TEST(IteratorConstructorTest, Inline) {
} }
TEST(IteratorConstructorTest, NonPod) { TEST(IteratorConstructorTest, NonPod) {
char const* kInput[] = char const* kInput[] = {"red", "orange", "yellow", "green",
{ "red", "orange", "yellow", "green", "blue", "indigo", "violet" }; "blue", "indigo", "violet"};
absl::FixedArray<std::string> const fixed(kInput, absl::FixedArray<std::string> const fixed(kInput,
kInput + ABSL_ARRAYSIZE(kInput)); kInput + ABSL_ARRAYSIZE(kInput));
ASSERT_EQ(ABSL_ARRAYSIZE(kInput), fixed.size()); ASSERT_EQ(ABSL_ARRAYSIZE(kInput), fixed.size());
@ -508,7 +502,6 @@ struct PickyDelete {
TEST(FixedArrayTest, UsesGlobalAlloc) { absl::FixedArray<PickyDelete, 0> a(5); } TEST(FixedArrayTest, UsesGlobalAlloc) { absl::FixedArray<PickyDelete, 0> a(5); }
TEST(FixedArrayTest, Data) { TEST(FixedArrayTest, Data) {
static const int kInput[] = {2, 3, 5, 7, 11, 13, 17}; static const int kInput[] = {2, 3, 5, 7, 11, 13, 17};
absl::FixedArray<int> fa(std::begin(kInput), std::end(kInput)); absl::FixedArray<int> fa(std::begin(kInput), std::end(kInput));

View file

@ -1,4 +1,4 @@
// Copyright 2017 The Abseil Authors. // Copyright 2019 The Abseil Authors.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@ -76,12 +76,9 @@ TYPED_TEST_SUITE_P(InstanceTest);
// destroyed in the erase(begin, end) test. // destroyed in the erase(begin, end) test.
class RefCounted { class RefCounted {
public: public:
RefCounted(int value, int* count) : value_(value), count_(count) { RefCounted(int value, int* count) : value_(value), count_(count) { Ref(); }
Ref();
}
RefCounted(const RefCounted& v) RefCounted(const RefCounted& v) : value_(v.value_), count_(v.count_) {
: value_(v.value_), count_(v.count_) {
Ref(); Ref();
} }
@ -1247,9 +1244,8 @@ void InstanceCountElemAssignWithAllocationTest() {
absl::InlinedVector<Instance, 2> v(original_contents.begin(), absl::InlinedVector<Instance, 2> v(original_contents.begin(),
original_contents.end()); original_contents.end());
v.assign(3, Instance(123)); v.assign(3, Instance(123));
EXPECT_THAT(v, EXPECT_THAT(v, AllOf(SizeIs(3), ElementsAre(ValueIs(123), ValueIs(123),
AllOf(SizeIs(3), ValueIs(123))));
ElementsAre(ValueIs(123), ValueIs(123), ValueIs(123))));
EXPECT_LE(v.size(), v.capacity()); EXPECT_LE(v.size(), v.capacity());
} }
} }
@ -1528,8 +1524,8 @@ TYPED_TEST_P(InstanceTest, InitializerListAssign) {
SCOPED_TRACE(original_size); SCOPED_TRACE(original_size);
absl::InlinedVector<Instance, 2> v(original_size, Instance(12345)); absl::InlinedVector<Instance, 2> v(original_size, Instance(12345));
v.assign({Instance(3), Instance(4), Instance(5)}); v.assign({Instance(3), Instance(4), Instance(5)});
EXPECT_THAT(v, AllOf(SizeIs(3), EXPECT_THAT(
ElementsAre(ValueIs(3), ValueIs(4), ValueIs(5)))); v, AllOf(SizeIs(3), ElementsAre(ValueIs(3), ValueIs(4), ValueIs(5))));
EXPECT_LE(3, v.capacity()); EXPECT_LE(3, v.capacity());
} }
} }
@ -1681,8 +1677,7 @@ TEST(AllocatorSupportTest, SwapOneAllocated) {
TEST(AllocatorSupportTest, ScopedAllocatorWorks) { TEST(AllocatorSupportTest, ScopedAllocatorWorks) {
using StdVector = std::vector<int, CountingAllocator<int>>; using StdVector = std::vector<int, CountingAllocator<int>>;
using MyAlloc = using MyAlloc = std::scoped_allocator_adaptor<CountingAllocator<StdVector>>;
std::scoped_allocator_adaptor<CountingAllocator<StdVector>>;
using AllocVec = absl::InlinedVector<StdVector, 4, MyAlloc>; using AllocVec = absl::InlinedVector<StdVector, 4, MyAlloc>;
// MSVC 2017's std::vector allocates different amounts of memory in debug // MSVC 2017's std::vector allocates different amounts of memory in debug

View file

@ -107,7 +107,8 @@ static const char *TrySymbolizeWithLimit(void *pc, int limit) {
ABSL_RAW_CHECK(strnlen(heap_buffer.get(), limit) < limit, ABSL_RAW_CHECK(strnlen(heap_buffer.get(), limit) < limit,
"absl::Symbolize() did not properly terminate the string"); "absl::Symbolize() did not properly terminate the string");
strncpy(try_symbolize_buffer, heap_buffer.get(), strncpy(try_symbolize_buffer, heap_buffer.get(),
sizeof(try_symbolize_buffer)); sizeof(try_symbolize_buffer) - 1);
try_symbolize_buffer[sizeof(try_symbolize_buffer) - 1] = '\0';
} }
return found ? try_symbolize_buffer : nullptr; return found ? try_symbolize_buffer : nullptr;

View file

@ -239,8 +239,8 @@ bool TimeZoneInfo::Header::Build(const tzhead& tzh) {
leapcnt = static_cast<std::size_t>(v); leapcnt = static_cast<std::size_t>(v);
if ((v = Decode32(tzh.tzh_ttisstdcnt)) < 0) return false; if ((v = Decode32(tzh.tzh_ttisstdcnt)) < 0) return false;
ttisstdcnt = static_cast<std::size_t>(v); ttisstdcnt = static_cast<std::size_t>(v);
if ((v = Decode32(tzh.tzh_ttisgmtcnt)) < 0) return false; if ((v = Decode32(tzh.tzh_ttisutcnt)) < 0) return false;
ttisgmtcnt = static_cast<std::size_t>(v); ttisutcnt = static_cast<std::size_t>(v);
return true; return true;
} }
@ -253,7 +253,7 @@ std::size_t TimeZoneInfo::Header::DataLength(std::size_t time_len) const {
len += 1 * charcnt; // abbreviations len += 1 * charcnt; // abbreviations
len += (time_len + 4) * leapcnt; // leap-time + TAI-UTC len += (time_len + 4) * leapcnt; // leap-time + TAI-UTC
len += 1 * ttisstdcnt; // UTC/local indicators len += 1 * ttisstdcnt; // UTC/local indicators
len += 1 * ttisgmtcnt; // standard/wall indicators len += 1 * ttisutcnt; // standard/wall indicators
return len; return len;
} }
@ -427,7 +427,7 @@ bool TimeZoneInfo::Load(const std::string& name, ZoneInfoSource* zip) {
} }
if (hdr.ttisstdcnt != 0 && hdr.ttisstdcnt != hdr.typecnt) if (hdr.ttisstdcnt != 0 && hdr.ttisstdcnt != hdr.typecnt)
return false; return false;
if (hdr.ttisgmtcnt != 0 && hdr.ttisgmtcnt != hdr.typecnt) if (hdr.ttisutcnt != 0 && hdr.ttisutcnt != hdr.typecnt)
return false; return false;
// Read the data into a local buffer. // Read the data into a local buffer.
@ -498,7 +498,7 @@ bool TimeZoneInfo::Load(const std::string& name, ZoneInfoSource* zip) {
// that isn't the case here (see "zic -p"). // that isn't the case here (see "zic -p").
bp += (8 + 4) * hdr.leapcnt; // leap-time + TAI-UTC bp += (8 + 4) * hdr.leapcnt; // leap-time + TAI-UTC
bp += 1 * hdr.ttisstdcnt; // UTC/local indicators bp += 1 * hdr.ttisstdcnt; // UTC/local indicators
bp += 1 * hdr.ttisgmtcnt; // standard/wall indicators bp += 1 * hdr.ttisutcnt; // standard/wall indicators
assert(bp == tbuf.data() + tbuf.size()); assert(bp == tbuf.data() + tbuf.size());
future_spec_.clear(); future_spec_.clear();

View file

@ -88,7 +88,7 @@ class TimeZoneInfo : public TimeZoneIf {
std::size_t charcnt; // zone abbreviation characters std::size_t charcnt; // zone abbreviation characters
std::size_t leapcnt; // leap seconds (we expect none) std::size_t leapcnt; // leap seconds (we expect none)
std::size_t ttisstdcnt; // UTC/local indicators (unused) std::size_t ttisstdcnt; // UTC/local indicators (unused)
std::size_t ttisgmtcnt; // standard/wall indicators (unused) std::size_t ttisutcnt; // standard/wall indicators (unused)
bool Build(const tzhead& tzh); bool Build(const tzhead& tzh);
std::size_t DataLength(std::size_t time_len) const; std::size_t DataLength(std::size_t time_len) const;

View file

@ -46,7 +46,7 @@ struct tzhead {
char tzh_magic[4]; /* TZ_MAGIC */ char tzh_magic[4]; /* TZ_MAGIC */
char tzh_version[1]; /* '\0' or '2' or '3' as of 2013 */ char tzh_version[1]; /* '\0' or '2' or '3' as of 2013 */
char tzh_reserved[15]; /* reserved; must be zero */ char tzh_reserved[15]; /* reserved; must be zero */
char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */ char tzh_ttisutcnt[4]; /* coded number of trans. time flags */
char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */ char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */
char tzh_leapcnt[4]; /* coded number of leap seconds */ char tzh_leapcnt[4]; /* coded number of leap seconds */
char tzh_timecnt[4]; /* coded number of transition times */ char tzh_timecnt[4]; /* coded number of transition times */
@ -69,14 +69,15 @@ struct tzhead {
** one (char [4]) total correction after above ** one (char [4]) total correction after above
** tzh_ttisstdcnt (char)s indexed by type; if 1, transition ** tzh_ttisstdcnt (char)s indexed by type; if 1, transition
** time is standard time, if 0, ** time is standard time, if 0,
** transition time is wall clock time ** transition time is local (wall clock)
** if absent, transition times are ** time; if absent, transition times are
** assumed to be wall clock time
** tzh_ttisgmtcnt (char)s indexed by type; if 1, transition
** time is UT, if 0,
** transition time is local time
** if absent, transition times are
** assumed to be local time ** assumed to be local time
** tzh_ttisutcnt (char)s indexed by type; if 1, transition
** time is UT, if 0, transition time is
** local time; if absent, transition
** times are assumed to be local time.
** When this is 1, the corresponding
** std/wall indicator must also be 1.
*/ */
/* /*

View file

@ -1 +1 @@
2019a 2019b

Some files were not shown because too many files have changed in this diff Show more