@@ -31,11 +31,12 @@ Symbolizer *Symbolizer::GetOrInit() {
31
31
32
32
const char *ExtractToken (const char *str, const char *delims, char **result) {
33
33
uptr prefix_len = internal_strcspn (str, delims);
34
- *result = (char *)InternalAlloc (prefix_len + 1 );
34
+ *result = (char *)InternalAlloc (prefix_len + 1 );
35
35
internal_memcpy (*result, str, prefix_len);
36
36
(*result)[prefix_len] = ' \0 ' ;
37
37
const char *prefix_end = str + prefix_len;
38
- if (*prefix_end != ' \0 ' ) prefix_end++;
38
+ if (*prefix_end != ' \0 ' )
39
+ prefix_end++;
39
40
return prefix_end;
40
41
}
41
42
@@ -78,7 +79,8 @@ const char *ExtractTokenUpToDelimiter(const char *str, const char *delimiter,
78
79
internal_memcpy (*result, str, prefix_len);
79
80
(*result)[prefix_len] = ' \0 ' ;
80
81
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);
82
84
return prefix_end;
83
85
}
84
86
@@ -215,18 +217,20 @@ const LoadedModule *Symbolizer::FindModuleForAddress(uptr address) {
215
217
modules_were_reloaded = true ;
216
218
}
217
219
const LoadedModule *module = SearchForModule (modules_, address);
218
- if (module ) return module ;
220
+ if (module )
221
+ return module ;
219
222
220
223
// dlopen/dlclose interceptors invalidate the module list, but when
221
224
// interception is disabled, we need to retry if the lookup fails in
222
225
// case the module list changed.
223
- #if !SANITIZER_INTERCEPT_DLOPEN_DLCLOSE
226
+ # if !SANITIZER_INTERCEPT_DLOPEN_DLCLOSE
224
227
if (!modules_were_reloaded) {
225
228
RefreshModules ();
226
229
module = SearchForModule (modules_, address);
227
- if (module ) return module ;
230
+ if (module )
231
+ return module ;
228
232
}
229
- #endif
233
+ # endif
230
234
231
235
if (fallback_modules_.size ()) {
232
236
module = SearchForModule (fallback_modules_, address);
@@ -260,31 +264,31 @@ class LLVMSymbolizerProcess final : public SymbolizerProcess {
260
264
// script/asan_symbolize.py and sanitizer_common.h.
261
265
void GetArgV (const char *path_to_binary,
262
266
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
270
274
const char *const kSymbolizerArch = " --default-arch=loongarch64" ;
271
- #elif SANITIZER_RISCV64
275
+ # elif SANITIZER_RISCV64
272
276
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
288
292
289
293
const char *const demangle_flag =
290
294
common_flags ()->demangle ? " --demangle" : " --no-demangle" ;
@@ -315,7 +319,8 @@ static const char *ParseFileLineInfo(AddressInfo *info, const char *str) {
315
319
char *back = file_line_info + size - 1 ;
316
320
for (int i = 0 ; i < 2 ; ++i) {
317
321
while (back > file_line_info && IsDigit (*back)) --back;
318
- if (*back != ' :' || !IsDigit (back[1 ])) break ;
322
+ if (*back != ' :' || !IsDigit (back[1 ]))
323
+ break ;
319
324
info->column = info->line ;
320
325
info->line = internal_atoll (back + 1 );
321
326
// Truncate the string at the colon to keep only filename.
@@ -436,7 +441,7 @@ bool LLVMSymbolizer::SymbolizeData(uptr addr, DataInfo *info) {
436
441
if (!buf)
437
442
return false ;
438
443
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.
440
445
return true ;
441
446
}
442
447
@@ -459,10 +464,9 @@ const char *LLVMSymbolizer::FormatAndSendCommand(const char *command_prefix,
459
464
size_needed = internal_snprintf (buffer_, kBufferSize , " %s \" %s\" 0x%zx\n " ,
460
465
command_prefix, module_name, module_offset);
461
466
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);
466
470
467
471
if (size_needed >= static_cast <int >(kBufferSize )) {
468
472
Report (" WARNING: Command buffer too small" );
@@ -484,9 +488,9 @@ SymbolizerProcess::SymbolizerProcess(const char *path, bool use_posix_spawn)
484
488
CHECK_NE (path_[0 ], ' \0 ' );
485
489
}
486
490
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)) {
490
494
return !internal_strcmp (ProcessName, SymbolizerName);
491
495
}
492
496
}
@@ -516,9 +520,9 @@ const char *SymbolizerProcess::SendCommand(const char *command) {
516
520
517
521
const char *SymbolizerProcess::SendCommandImpl (const char *command) {
518
522
if (input_fd_ == kInvalidFd || output_fd_ == kInvalidFd )
519
- return nullptr ;
523
+ return nullptr ;
520
524
if (!WriteToSymbolizer (command, internal_strlen (command)))
521
- return nullptr ;
525
+ return nullptr ;
522
526
if (!ReadFromSymbolizer ())
523
527
return nullptr ;
524
528
return buffer_.data ();
0 commit comments