Export of internal Abseil changes
--
990253454819ce26ff1dda9ab4bbc145b61d01e4 by Xiaoyi Zhang <zhangxy@google.com>:
Import github PR https://github.com/abseil/abseil-cpp/pull/645
PiperOrigin-RevId: 303119797
--
5ac845cb7929b7d1eaf59a309afd811db5001175 by Abseil Team <absl-team@google.com>:
Fix internal exception spec compatibility error
PiperOrigin-RevId: 303104081
--
3290595dd866eecab3c7044e2e3ca0adb74f1bf5 by Gennadiy Rozental <rogeeff@google.com>:
Use FlagValue<T> to represent the value of a flag. Place it directly after
FlagImpl and use a computed offset refer to it.
The offset is computed based on the assumption that the `value_` data member
is placed directly after the impl_ data member in Flag<T>.
This change will allow us to migrate to `T`-specific storage in the generic case.
This change decreases the overhead for int flags by 32 bytes.
PiperOrigin-RevId: 303038099
--
f2b37722cd7a6d3a60ef9713f0d2bbff56f3ddbf by Derek Mauro <dmauro@google.com>:
Minor correctness fix for an ABSL_HAVE_BUILTIN conditional
PiperOrigin-RevId: 302980666
--
39c079a6141ae1c5728af8bf33a39c8aff9deb9f by Abseil Team <absl-team@google.com>:
Use ABSL_HARDENING_ASSERT in b-tree and SwissTable iterators.
PiperOrigin-RevId: 302970075
--
9668a044e080c789df32bcaa1ffb5100831cd9fa by Benjamin Barenblat <bbaren@google.com>:
Correct `add_subdirectory` line in CMake googletest support
Commit bcefbdcdf6 added support for building with CMake against a local googletest checkout, but I missed a line when constructing the diff. Change the `add_subdirectory` line to reference the correct directories.
PiperOrigin-RevId: 302947488
--
0a3c10fabf80a43ca69ab8b1570030e55f2be741 by Andy Soffer <asoffer@google.com>:
Remove unused distribution format traits.
PiperOrigin-RevId: 302896176
--
0478f2f6270e5ed64c0e28ec09556ca90b2d46a9 by Samuel Benzaquen <sbenza@google.com>:
Fix for CWG:2310.
PiperOrigin-RevId: 302734089
--
3cb978dda5cae5905affdc0914dcc2d27671ed11 by Samuel Benzaquen <sbenza@google.com>:
Fix the Allocate/Deallocate functions to use the same underlying allocator type.
PiperOrigin-RevId: 302721804
--
ae38d3984fb68b4e3ddc165fa8d5c24d5936be52 by Matthew Brown <matthewbr@google.com>:
Internal Change
PiperOrigin-RevId: 302717314
--
7357cf7abd03cc60b6e82b5f28a8e34935c3b4dc by Andy Getzendanner <durandal@google.com>:
Fix typo: s/ABSL_HARDENED_ASSERT/ABSL_HARDENING_ASSERT/
PiperOrigin-RevId: 302532164
GitOrigin-RevId: 990253454819ce26ff1dda9ab4bbc145b61d01e4
Change-Id: Ie595a221c16e1e7e1255ad42e029b646c5f3e11d
This commit is contained in:
parent
132d791b40
commit
79e0dc1151
29 changed files with 387 additions and 607 deletions
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
#include <cstdint>
|
||||
#include <tuple>
|
||||
#include <typeindex>
|
||||
#include <typeinfo>
|
||||
#include <utility>
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
|
|
@ -27,6 +29,9 @@ ABSL_NAMESPACE_BEGIN
|
|||
namespace container_internal {
|
||||
namespace {
|
||||
|
||||
using ::testing::Gt;
|
||||
using ::testing::_;
|
||||
using ::testing::ElementsAre;
|
||||
using ::testing::Pair;
|
||||
|
||||
TEST(Memory, AlignmentLargerThanBase) {
|
||||
|
|
@ -45,6 +50,39 @@ TEST(Memory, AlignmentSmallerThanBase) {
|
|||
Deallocate<2>(&alloc, mem, 3);
|
||||
}
|
||||
|
||||
std::map<std::type_index, int>& AllocationMap() {
|
||||
static auto* map = new std::map<std::type_index, int>;
|
||||
return *map;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
struct TypeCountingAllocator {
|
||||
TypeCountingAllocator() = default;
|
||||
template <typename U>
|
||||
TypeCountingAllocator(const TypeCountingAllocator<U>&) {} // NOLINT
|
||||
|
||||
using value_type = T;
|
||||
|
||||
T* allocate(size_t n, const void* = nullptr) {
|
||||
AllocationMap()[typeid(T)] += n;
|
||||
return std::allocator<T>().allocate(n);
|
||||
}
|
||||
void deallocate(T* p, std::size_t n) {
|
||||
AllocationMap()[typeid(T)] -= n;
|
||||
return std::allocator<T>().deallocate(p, n);
|
||||
}
|
||||
};
|
||||
|
||||
TEST(Memory, AllocateDeallocateMatchType) {
|
||||
TypeCountingAllocator<int> alloc;
|
||||
void* mem = Allocate<1>(&alloc, 1);
|
||||
// Verify that it was allocated
|
||||
EXPECT_THAT(AllocationMap(), ElementsAre(Pair(_, Gt(0))));
|
||||
Deallocate<1>(&alloc, mem, 1);
|
||||
// Verify that the deallocation matched.
|
||||
EXPECT_THAT(AllocationMap(), ElementsAre(Pair(_, 0)));
|
||||
}
|
||||
|
||||
class Fixture : public ::testing::Test {
|
||||
using Alloc = std::allocator<std::string>;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue