Skip to content

Commit a9268d5

Browse files
Ricardicuscopybara-github
authored andcommitted
PR #1914: absl/base/internal/poison.cc: Minor build fix
Imported from GitHub PR #1914 ``` : warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] 50 | return getpagesize(); | ~~~~~~ ^~~~~~~~~~~~~ ../_deps/absl-src/absl/base/internal/poison.cc:79:29: error: use of undeclared identifier 'data' 79 | return static_cast<char*>(data) + block_size / 2; | ^ 1 warning and 1 error generated. gmake[2]: *** [_deps/absl-build/absl/base/CMakeFiles/poison.dir/build.make:76: _deps/absl-build/absl/base/CMakeFiles/poison.dir/internal/poison.cc.obj] Error 1 gmake[1]: *** [CMakeFiles/Makefile2:1843: _deps/absl-build/absl/base/CMakeFiles/poison.dir/all] Error 2 gmake: *** [Makefile:136: all] Error 2 ``` Merge 6b172a2 into 785b11b Merging this change closes #1914 COPYBARA_INTEGRATE_REVIEW=#1914 from Ricardicus:master 6b172a2 PiperOrigin-RevId: 788985640 Change-Id: Ife849052c340985d08a4dda131dad086e670d901
1 parent 785b11b commit a9268d5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

absl/base/internal/poison.cc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,20 @@ size_t GetPageSize() {
5757

5858
void* InitializePoisonedPointerInternal() {
5959
const size_t block_size = GetPageSize();
60+
void* data = nullptr;
6061
#if defined(ABSL_HAVE_ADDRESS_SANITIZER)
61-
void* data = malloc(block_size);
62+
data = malloc(block_size);
6263
ASAN_POISON_MEMORY_REGION(data, block_size);
6364
#elif defined(ABSL_HAVE_MEMORY_SANITIZER)
64-
void* data = malloc(block_size);
65+
data = malloc(block_size);
6566
__msan_poison(data, block_size);
6667
#elif defined(ABSL_HAVE_MMAP)
67-
void* data = DirectMmap(nullptr, block_size, PROT_NONE,
68-
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
68+
data = DirectMmap(nullptr, block_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS,
69+
-1, 0);
6970
if (data == MAP_FAILED) return GetBadPointerInternal();
7071
#elif defined(_WIN32)
71-
void* data = VirtualAlloc(nullptr, block_size, MEM_RESERVE | MEM_COMMIT,
72-
PAGE_NOACCESS);
72+
data = VirtualAlloc(nullptr, block_size, MEM_RESERVE | MEM_COMMIT,
73+
PAGE_NOACCESS);
7374
if (data == nullptr) return GetBadPointerInternal();
7475
#else
7576
return GetBadPointerInternal();

0 commit comments

Comments
 (0)