From 724efbb57c65cc61173fffe7365d467b4058eae7 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Tue, 14 Dec 2021 06:28:40 +0000 Subject: [PATCH] Mark variables as unused. clang is smart enough to notice a variable is set but not used, but these variable are used for testing purposes. Mark one as unused, and convert the other to a DoNotOptimize. Bug: 197240255 Test: Compiles without warnings. Test: Ran unit tests on coral hwasan build. Change-Id: Ibc873e477355a702579e5a680780c77db0c58046 --- tests/sys_ttydefaults_test.cpp | 2 +- tests/unistd_test.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys_ttydefaults_test.cpp b/tests/sys_ttydefaults_test.cpp index fa4f7c708..73aa448ba 100644 --- a/tests/sys_ttydefaults_test.cpp +++ b/tests/sys_ttydefaults_test.cpp @@ -20,7 +20,7 @@ #include TEST(sys_ttydefaults, flags) { - int i; + [[maybe_unused]] int i; i = TTYDEF_IFLAG; i = TTYDEF_OFLAG; i = TTYDEF_LFLAG; diff --git a/tests/unistd_test.cpp b/tests/unistd_test.cpp index 840dad074..c306a0873 100644 --- a/tests/unistd_test.cpp +++ b/tests/unistd_test.cpp @@ -688,9 +688,9 @@ __attribute__((noinline)) static void HwasanVforkTestChild() { __attribute__((noinline)) static void HwasanReadMemory(const char* p, size_t size) { // Read memory byte-by-byte. This will blow up if the pointer tag in p does not match any memory // tag in [p, p+size). - volatile char z; + char z; for (size_t i = 0; i < size; ++i) { - z = p[i]; + DoNotOptimize(z = p[i]); } }