commit 1dfd76ac2c7f5e993cde7407931bfd01dceca44d
author Evgenii Stepanov <eugenis@google.com> Mon Sep 18 17:51:48 2017 -0700
committer Evgenii Stepanov <eugenis@google.com> Tue Sep 19 13:59:34 2017 -0700
tree ccc5721e5e442453d7515f604cfbf2b3655572a3
parent 0d9301e1562b3804ed86c0afe3fa2b56eb6ce573

Extend cfi test to verify a range of target pointers.

Test: bionic device tests
Bug: 63400743
Bug: 65590288
Change-Id: Ic4ef9630a2db709cf4edcc7f76c791df3f349192

tests/libs/cfi_test_lib.cpp

diff --git a/tests/libs/cfi_test_lib.cpp b/tests/libs/cfi_test_lib.cpp
index 959b102..9f456d3 100644
--- a/tests/libs/cfi_test_lib.cpp
+++ b/tests/libs/cfi_test_lib.cpp
@@ -22,13 +22,16 @@
 // present. But it is only used in the bionic loader tests.
 extern "C" __attribute__((weak)) void __cfi_slowpath(uint64_t, void*);
 
-static int g_count;
+static size_t g_count;
 static uint64_t g_last_type_id;
 static void* g_last_address;
 static void* g_last_diag;
 
 extern "C" {
 
+// Make sure the library crosses at least one kLibraryAlignment(=256KB) boundary.
+char bss[1024 * 1024];
+
 // Mock a CFI-enabled library without relying on the compiler.
 __attribute__((aligned(4096))) void __cfi_check(uint64_t CallSiteTypeId, void* TargetAddr,
                                                 void* Diag) {
@@ -38,7 +41,7 @@
   g_last_diag = Diag;
 }
 
-int get_count() {
+size_t get_count() {
   return g_count;
 }