Skip to content

Commit 50fe5b9

Browse files
authored
[sanitizer_common][NFC] Fix sanitizer_symbolizer_libcdep.cpp formatting (llvm#133930)
1 parent b8fc288 commit 50fe5b9

File tree

1 file changed

+45
-41
lines changed

1 file changed

+45
-41
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ Symbolizer *Symbolizer::GetOrInit() {
3131

3232
const char *ExtractToken(const char *str, const char *delims, char **result) {
3333
uptr prefix_len = internal_strcspn(str, delims);
34-
*result = (char*)InternalAlloc(prefix_len + 1);
34+
*result = (char *)InternalAlloc(prefix_len + 1);
3535
internal_memcpy(*result, str, prefix_len);
3636
(*result)[prefix_len] = '\0';
3737
const char *prefix_end = str + prefix_len;
38-
if (*prefix_end != '\0') prefix_end++;
38+
if (*prefix_end != '\0')
39+
prefix_end++;
3940
return prefix_end;
4041
}
4142

@@ -78,7 +79,8 @@ const char *ExtractTokenUpToDelimiter(const char *str, const char *delimiter,
7879
internal_memcpy(*result, str, prefix_len);
7980
(*result)[prefix_len] = '\0';
8081
const char *prefix_end = str + prefix_len;
81-
if (*prefix_end != '\0') prefix_end += internal_strlen(delimiter);
82+
if (*prefix_end != '\0')
83+
prefix_end += internal_strlen(delimiter);
8284
return prefix_end;
8385
}
8486

@@ -215,18 +217,20 @@ const LoadedModule *Symbolizer::FindModuleForAddress(uptr address) {
215217
modules_were_reloaded = true;
216218
}
217219
const LoadedModule *module = SearchForModule(modules_, address);
218-
if (module) return module;
220+
if (module)
221+
return module;
219222

220223
// dlopen/dlclose interceptors invalidate the module list, but when
221224
// interception is disabled, we need to retry if the lookup fails in
222225
// case the module list changed.
223-
#if !SANITIZER_INTERCEPT_DLOPEN_DLCLOSE
226+
# if !SANITIZER_INTERCEPT_DLOPEN_DLCLOSE
224227
if (!modules_were_reloaded) {
225228
RefreshModules();
226229
module = SearchForModule(modules_, address);
227-
if (module) return module;
230+
if (module)
231+
return module;
228232
}
229-
#endif
233+
# endif
230234

231235
if (fallback_modules_.size()) {
232236
module = SearchForModule(fallback_modules_, address);
@@ -260,31 +264,31 @@ class LLVMSymbolizerProcess final : public SymbolizerProcess {
260264
// script/asan_symbolize.py and sanitizer_common.h.
261265
void GetArgV(const char *path_to_binary,
262266
const char *(&argv)[kArgVMax]) const override {
263-
#if defined(__x86_64h__)
264-
const char* const kSymbolizerArch = "--default-arch=x86_64h";
265-
#elif defined(__x86_64__)
266-
const char* const kSymbolizerArch = "--default-arch=x86_64";
267-
#elif defined(__i386__)
268-
const char* const kSymbolizerArch = "--default-arch=i386";
269-
#elif SANITIZER_LOONGARCH64
267+
# if defined(__x86_64h__)
268+
const char *const kSymbolizerArch = "--default-arch=x86_64h";
269+
# elif defined(__x86_64__)
270+
const char *const kSymbolizerArch = "--default-arch=x86_64";
271+
# elif defined(__i386__)
272+
const char *const kSymbolizerArch = "--default-arch=i386";
273+
# elif SANITIZER_LOONGARCH64
270274
const char *const kSymbolizerArch = "--default-arch=loongarch64";
271-
#elif SANITIZER_RISCV64
275+
# elif SANITIZER_RISCV64
272276
const char *const kSymbolizerArch = "--default-arch=riscv64";
273-
#elif defined(__aarch64__)
274-
const char* const kSymbolizerArch = "--default-arch=arm64";
275-
#elif defined(__arm__)
276-
const char* const kSymbolizerArch = "--default-arch=arm";
277-
#elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
278-
const char* const kSymbolizerArch = "--default-arch=powerpc64";
279-
#elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
280-
const char* const kSymbolizerArch = "--default-arch=powerpc64le";
281-
#elif defined(__s390x__)
282-
const char* const kSymbolizerArch = "--default-arch=s390x";
283-
#elif defined(__s390__)
284-
const char* const kSymbolizerArch = "--default-arch=s390";
285-
#else
286-
const char* const kSymbolizerArch = "--default-arch=unknown";
287-
#endif
277+
# elif defined(__aarch64__)
278+
const char *const kSymbolizerArch = "--default-arch=arm64";
279+
# elif defined(__arm__)
280+
const char *const kSymbolizerArch = "--default-arch=arm";
281+
# elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
282+
const char *const kSymbolizerArch = "--default-arch=powerpc64";
283+
# elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
284+
const char *const kSymbolizerArch = "--default-arch=powerpc64le";
285+
# elif defined(__s390x__)
286+
const char *const kSymbolizerArch = "--default-arch=s390x";
287+
# elif defined(__s390__)
288+
const char *const kSymbolizerArch = "--default-arch=s390";
289+
# else
290+
const char *const kSymbolizerArch = "--default-arch=unknown";
291+
# endif
288292

289293
const char *const demangle_flag =
290294
common_flags()->demangle ? "--demangle" : "--no-demangle";
@@ -315,7 +319,8 @@ static const char *ParseFileLineInfo(AddressInfo *info, const char *str) {
315319
char *back = file_line_info + size - 1;
316320
for (int i = 0; i < 2; ++i) {
317321
while (back > file_line_info && IsDigit(*back)) --back;
318-
if (*back != ':' || !IsDigit(back[1])) break;
322+
if (*back != ':' || !IsDigit(back[1]))
323+
break;
319324
info->column = info->line;
320325
info->line = internal_atoll(back + 1);
321326
// Truncate the string at the colon to keep only filename.
@@ -436,7 +441,7 @@ bool LLVMSymbolizer::SymbolizeData(uptr addr, DataInfo *info) {
436441
if (!buf)
437442
return false;
438443
ParseSymbolizeDataOutput(buf, info);
439-
info->start += (addr - info->module_offset); // Add the base address.
444+
info->start += (addr - info->module_offset); // Add the base address.
440445
return true;
441446
}
442447

@@ -459,10 +464,9 @@ const char *LLVMSymbolizer::FormatAndSendCommand(const char *command_prefix,
459464
size_needed = internal_snprintf(buffer_, kBufferSize, "%s \"%s\" 0x%zx\n",
460465
command_prefix, module_name, module_offset);
461466
else
462-
size_needed = internal_snprintf(buffer_, kBufferSize,
463-
"%s \"%s:%s\" 0x%zx\n", command_prefix,
464-
module_name, ModuleArchToString(arch),
465-
module_offset);
467+
size_needed = internal_snprintf(
468+
buffer_, kBufferSize, "%s \"%s:%s\" 0x%zx\n", command_prefix,
469+
module_name, ModuleArchToString(arch), module_offset);
466470

467471
if (size_needed >= static_cast<int>(kBufferSize)) {
468472
Report("WARNING: Command buffer too small");
@@ -484,9 +488,9 @@ SymbolizerProcess::SymbolizerProcess(const char *path, bool use_posix_spawn)
484488
CHECK_NE(path_[0], '\0');
485489
}
486490

487-
static bool IsSameModule(const char* path) {
488-
if (const char* ProcessName = GetProcessName()) {
489-
if (const char* SymbolizerName = StripModuleName(path)) {
491+
static bool IsSameModule(const char *path) {
492+
if (const char *ProcessName = GetProcessName()) {
493+
if (const char *SymbolizerName = StripModuleName(path)) {
490494
return !internal_strcmp(ProcessName, SymbolizerName);
491495
}
492496
}
@@ -516,9 +520,9 @@ const char *SymbolizerProcess::SendCommand(const char *command) {
516520

517521
const char *SymbolizerProcess::SendCommandImpl(const char *command) {
518522
if (input_fd_ == kInvalidFd || output_fd_ == kInvalidFd)
519-
return nullptr;
523+
return nullptr;
520524
if (!WriteToSymbolizer(command, internal_strlen(command)))
521-
return nullptr;
525+
return nullptr;
522526
if (!ReadFromSymbolizer())
523527
return nullptr;
524528
return buffer_.data();

0 commit comments

Comments
 (0)