Rebase

Created using spr 1.3.6-beta.1

Author: pcc

compiler-rt/test/hwasan/TestCases/Linux/release-shadow.c

@@ -22,7 +22,8 @@ const size_t kNumPages = 16 * kNumShadowPages;
 size_t page_size, map_size;
 
 void sync_rss() {
-  char *page = (char *)mmap(0, page_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+  char *page = (char *)mmap(0, page_size, PROT_READ | PROT_WRITE,
+                            MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
   // Linux kernel updates RSS counters after a set number of page faults.
   for (int i = 0; i < 100; ++i) {
     page[0] = 42;
@@ -66,7 +67,8 @@ int main() {
   fprintf(stderr, "starting rss %zu\n", current_rss());
   fprintf(stderr, "shadow pages: %zu\n", kNumShadowPages);
 
-  void *p = mmap(0, map_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+  void *p = mmap(0, map_size, PROT_READ | PROT_WRITE,
+                 MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
   fprintf(stderr, "p = %p\n", p);
 
   size_t total_count = 10;

compiler-rt/test/hwasan/TestCases/tag-mismatch-border-address.c

@@ -16,8 +16,8 @@ extern void *__hwasan_shadow_memory_dynamic_address;
 int main(int argc, char **argv) {
   size_t page_size = getauxval(AT_PAGESZ);
   void *high_addr = (char *)__hwasan_shadow_memory_dynamic_address - page_size;
-  void *r = mmap(high_addr, page_size, PROT_READ, MAP_FIXED | MAP_ANON | MAP_PRIVATE,
-                 -1, 0);
+  void *r = mmap(high_addr, page_size, PROT_READ,
+                 MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
   if (r == MAP_FAILED) {
     fprintf(stderr, "Failed to mmap\n");
     abort();