Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e7b7cbc authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Move variable only used on aarch64. 

The kTagGranuleSize is only used in aarch64, so you can get
unused variable warnings for other targets. Move this definition
closer to where it's used and in aarch64 code.

Test: Build with unused checking on.
Change-Id: I9baf660430508ee3ca1efb62585ee1b038c6b0f3
parent c9d70be7

debuggerd/debuggerd_test.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,6 @@ using ::testing::HasSubstr; 
#define ARCH_SUFFIX ""

#define ARCH_SUFFIX ""

#endif

#endif





constexpr size_t kTagGranuleSize = 16;

constexpr char kWaitForDebuggerKey[] = "debug.debuggerd.wait_for_debugger";

constexpr char kWaitForDebuggerKey[] = "debug.debuggerd.wait_for_debugger";





#define TIMEOUT(seconds, expr)                                     \

#define TIMEOUT(seconds, expr)                                     \
@@ -742,6 +741,8 @@ TEST_F(CrasherTest, mte_multiple_causes) { 
}

}





#if defined(__aarch64__)

#if defined(__aarch64__)

constexpr size_t kTagGranuleSize = 16;



static uintptr_t CreateTagMapping() {

static uintptr_t CreateTagMapping() {

  // Some of the MTE tag dump tests assert that there is an inaccessible page to the left and right

  // Some of the MTE tag dump tests assert that there is an inaccessible page to the left and right

  // of the PROT_MTE page, so map three pages and set the two guard pages to PROT_NONE.

  // of the PROT_MTE page, so map three pages and set the two guard pages to PROT_NONE.