Fix formatting

Author: jakeegan

compiler-rt/lib/sanitizer_common/sanitizer_aix.h

@@ -19,7 +19,7 @@
 #  include "sanitizer_posix.h"
 
 struct prmap;
- typedef struct prmap prmap_t;
+typedef struct prmap prmap_t;
 
 namespace __sanitizer {
 

compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h

@@ -40,9 +40,13 @@ class MemoryMappedSegment {
  public:
   explicit MemoryMappedSegment(char *buff = nullptr, uptr size = 0)
       : filename(buff), filename_size(size), data_(nullptr) {}
-  explicit MemoryMappedSegment(char *buff, uptr size, char *display_buff, uptr display_size)
-      : filename(buff), filename_size(size), displayname(display_buff),
-      displayname_size(display_size), data_(nullptr) {}
+  explicit MemoryMappedSegment(char *buff, uptr size, char *display_buff,
+                               uptr display_size)
+      : filename(buff),
+        filename_size(size),
+        displayname(display_buff),
+        displayname_size(display_size),
+        data_(nullptr) {}
   ~MemoryMappedSegment() {}
 
   bool IsReadable() const { return protection & kProtectionRead; }

compiler-rt/lib/sanitizer_common/sanitizer_procmaps_aix.cpp

@@ -13,17 +13,17 @@
 
 #if SANITIZER_AIX
 #  include <assert.h>
-#  include <stdlib.h>
 #  include <stdio.h>
+#  include <stdlib.h>
 #  include <sys/procfs.h>
 
 #  include "sanitizer_common.h"
-#  include "sanitizer_procmaps.h"
 #  include "sanitizer_file.h"
+#  include "sanitizer_procmaps.h"
 
 namespace __sanitizer {
 
-static int qsort_comp(const void *va, const void * vb) {
+static int qsort_comp(const void *va, const void *vb) {
   const prmap_t *a = (const prmap_t *)va;
   const prmap_t *b = (const prmap_t *)vb;
 
@@ -37,12 +37,11 @@ static int qsort_comp(const void *va, const void * vb) {
 }
 
 static prmap_t *SortProcMapEntries(char *buffer) {
-  prmap_t *begin = (prmap_t*)buffer;
+  prmap_t *begin = (prmap_t *)buffer;
   prmap_t *mapIter = begin;
   // The AIX procmap utility detects the end of the array of `prmap`s by finding
   // an entry where pr_size and pr_vaddr are both zero.
-  while (mapIter->pr_size != 0 || mapIter->pr_vaddr != 0)
-    ++mapIter;
+  while (mapIter->pr_size != 0 || mapIter->pr_vaddr != 0) ++mapIter;
   prmap_t *end = mapIter;
 
   size_t count = end - begin;
@@ -57,7 +56,8 @@ void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
   constexpr unsigned BUFFER_SIZE = 128;
   char filenameBuf[BUFFER_SIZE] = {};
   internal_snprintf(filenameBuf, BUFFER_SIZE, "/proc/%d/map", pid);
-  if (!ReadFileToBuffer(filenameBuf, &proc_maps->data, &proc_maps->mmaped_size, &proc_maps->len)) {
+  if (!ReadFileToBuffer(filenameBuf, &proc_maps->data, &proc_maps->mmaped_size,
+                        &proc_maps->len)) {
     proc_maps->data = nullptr;
     proc_maps->mmaped_size = 0;
     proc_maps->len = 0;
@@ -106,15 +106,17 @@ bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
     constexpr unsigned BUFFER_SIZE = 128;
     char objPath[BUFFER_SIZE] = {};
     // Use path /proc/<pid>/object/<object_id> to pass to the symbolizer.
-    internal_snprintf(objPath, BUFFER_SIZE, "/proc/%d/object/%s", internal_getpid(), mapIter->pr_mapname);
+    internal_snprintf(objPath, BUFFER_SIZE, "/proc/%d/object/%s",
+                      internal_getpid(), mapIter->pr_mapname);
     len = Min((uptr)internal_strlen(objPath), segment->filename_size - 1);
     internal_strncpy(segment->filename, objPath, len);
     segment->filename[len] = 0;
 
-    // We don't have the full path to user libraries, so we use what we have available as the
-    // display name.
+    // We don't have the full path to user libraries, so we use what we have
+    // available as the display name.
     const char *displayPath = data_.proc_self_maps.data + mapIter->pr_pathoff;
-    len = Min((uptr)internal_strlen(displayPath), segment->displayname_size - 1);
+    len =
+        Min((uptr)internal_strlen(displayPath), segment->displayname_size - 1);
     internal_strncpy(segment->displayname, displayPath, len);
     segment->displayname[len] = 0;
   } else if (segment->filename) {
@@ -126,7 +128,7 @@ bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
   segment->offset = 0;
 
   ++mapIter;
-  data_.current = (const char*)mapIter;
+  data_.current = (const char *)mapIter;
 
   return true;
 }

compiler-rt/lib/sanitizer_common/sanitizer_procmaps_common.cpp

@@ -121,21 +121,23 @@ void MemoryMappingLayout::DumpListOfModules(
     InternalMmapVectorNoCtor<LoadedModule> *modules) {
   Reset();
   InternalMmapVector<char> module_name(kMaxPathLength);
-#if SANITIZER_AIX
+#  if SANITIZER_AIX
   InternalMmapVector<char> module_displayname(kMaxPathLength);
   MemoryMappedSegment segment(module_name.data(), module_name.size(),
-                              module_displayname.data(), module_displayname.size());
-#else
+                              module_displayname.data(),
+                              module_displayname.size());
+#  else
   MemoryMappedSegment segment(module_name.data(), module_name.size());
-#endif
+#  endif
   for (uptr i = 0; Next(&segment); i++) {
-// On AIX, filename contains /proc/<pid>/object/<object_id> to pass to the symbolizer, so we use displayname to
-// contain the real path to present to users
-#if SANITIZER_AIX
+// On AIX, filename contains /proc/<pid>/object/<object_id> to pass to the
+// symbolizer, so we use displayname to contain the real path to present to
+// users
+#  if SANITIZER_AIX
     const char *cur_name = segment.displayname;
-#else
+#  else
     const char *cur_name = segment.filename;
-#endif
+#  endif
     if (cur_name[0] == '\0')
       continue;
     // Don't subtract 'cur_beg' from the first entry:

compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp

@@ -274,6 +274,7 @@ class LLVMSymbolizerProcess final : public SymbolizerProcess {
     const char *const kSymbolizerArch = "--default-arch=loongarch64";
 #  elif SANITIZER_RISCV64
     const char *const kSymbolizerArch = "--default-arch=riscv64";
+<<<<<<< HEAD
 #  elif defined(__aarch64__)
     const char *const kSymbolizerArch = "--default-arch=arm64";
 #  elif defined(__arm__)