Skip to content

Commit

Permalink
[compiler-rt] Remove redundant checks. (#95753)
Browse files Browse the repository at this point in the history
Since `__sancov_default_options` and `__asan_default_suppressions` are
weak definitions, not weak references (declarations) the checks of
equality of addresses of these symbols to zero is not needed. So we can
completely remove `MaybeCallSancovDefaultOptions` and use
`__sancov_default_options` instead directly. gcc-14 emits `-Waddress`
warning to such checks.
  • Loading branch information
chestnykh committed Jul 2, 2024
1 parent a833fa7 commit 0330ce9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
3 changes: 1 addition & 2 deletions compiler-rt/lib/asan/asan_suppressions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ void InitializeSuppressions() {
suppression_ctx = new (suppression_placeholder)
SuppressionContext(kSuppressionTypes, ARRAY_SIZE(kSuppressionTypes));
suppression_ctx->ParseFromFile(flags()->suppressions);
if (&__asan_default_suppressions)
suppression_ctx->Parse(__asan_default_suppressions());
suppression_ctx->Parse(__asan_default_suppressions());
}

bool IsInterceptorSuppressed(const char *interceptor_name) {
Expand Down
6 changes: 1 addition & 5 deletions compiler-rt/lib/sanitizer_common/sancov_flags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,14 @@ static void RegisterSancovFlags(FlagParser *parser, SancovFlags *f) {
#undef SANCOV_FLAG
}

static const char *MaybeCallSancovDefaultOptions() {
return (&__sancov_default_options) ? __sancov_default_options() : "";
}

void InitializeSancovFlags() {
SancovFlags *f = sancov_flags();
f->SetDefaults();

FlagParser parser;
RegisterSancovFlags(&parser, f);

parser.ParseString(MaybeCallSancovDefaultOptions());
parser.ParseString(__sancov_default_options());
parser.ParseStringFromEnv("SANCOV_OPTIONS");

ReportUnrecognizedFlags();
Expand Down

0 comments on commit 0330ce9

Please sign in to comment.