diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-03 19:15:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-03 19:15:52 +0000 |
commit | 50d13d4adc7c1901718d082e8dad9352726c1376 (patch) | |
tree | 6ce4c02ea579d99f62d4031562bc9b73486c2e1d /absl/base/exception_safety_testing_test.cc | |
parent | 1b9099567bfa557b8ab0a74e9132b0733f2f549a (diff) | |
parent | 213e38c06e7f68c1f1587585c7501d44dbaeb7c6 (diff) | |
download | abseil-cpp-50d13d4adc7c1901718d082e8dad9352726c1376.tar.gz |
Snap for 11048893 from 213e38c06e7f68c1f1587585c7501d44dbaeb7c6 to androidx-lifecycle-release
Change-Id: I7c93129ee02debe454bd885f003c84a0593718e2
Diffstat (limited to 'absl/base/exception_safety_testing_test.cc')
-rw-r--r-- | absl/base/exception_safety_testing_test.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/absl/base/exception_safety_testing_test.cc b/absl/base/exception_safety_testing_test.cc index a87fd6a9..bf5aa7cf 100644 --- a/absl/base/exception_safety_testing_test.cc +++ b/absl/base/exception_safety_testing_test.cc @@ -148,7 +148,7 @@ TEST(ThrowingValueTest, ThrowingBitwiseOps) { ThrowingValue<> bomb1, bomb2; TestOp([&bomb1]() { ~bomb1; }); - TestOp([&]() { bomb1& bomb2; }); + TestOp([&]() { bomb1 & bomb2; }); TestOp([&]() { bomb1 | bomb2; }); TestOp([&]() { bomb1 ^ bomb2; }); } @@ -332,13 +332,16 @@ TEST(ThrowingValueTest, NonThrowingPlacementDelete) { constexpr int kArrayLen = 2; // We intentionally create extra space to store the tag allocated by placement // new[]. - constexpr int kStorageLen = 4; + constexpr size_t kExtraSpaceLen = sizeof(size_t) * 2; alignas(ThrowingValue<>) unsigned char buf[sizeof(ThrowingValue<>)]; alignas(ThrowingValue<>) unsigned char - array_buf[sizeof(ThrowingValue<>[kStorageLen])]; + array_buf[kExtraSpaceLen + sizeof(ThrowingValue<>[kArrayLen])]; auto* placed = new (&buf) ThrowingValue<>(1); auto placed_array = new (&array_buf) ThrowingValue<>[kArrayLen]; + auto* placed_array_end = reinterpret_cast<unsigned char*>(placed_array) + + sizeof(ThrowingValue<>[kArrayLen]); + EXPECT_LE(placed_array_end, array_buf + sizeof(array_buf)); SetCountdown(); ExpectNoThrow([placed, &buf]() { |