Skip to content

Commit 0330ce9

Browse files
authored
[compiler-rt] Remove redundant checks. (llvm#95753)
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.
1 parent a833fa7 commit 0330ce9

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

compiler-rt/lib/asan/asan_suppressions.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ void InitializeSuppressions() {
3939
suppression_ctx = new (suppression_placeholder)
4040
SuppressionContext(kSuppressionTypes, ARRAY_SIZE(kSuppressionTypes));
4141
suppression_ctx->ParseFromFile(flags()->suppressions);
42-
if (&__asan_default_suppressions)
43-
suppression_ctx->Parse(__asan_default_suppressions());
42+
suppression_ctx->Parse(__asan_default_suppressions());
4443
}
4544

4645
bool IsInterceptorSuppressed(const char *interceptor_name) {

compiler-rt/lib/sanitizer_common/sancov_flags.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,14 @@ static void RegisterSancovFlags(FlagParser *parser, SancovFlags *f) {
3737
#undef SANCOV_FLAG
3838
}
3939

40-
static const char *MaybeCallSancovDefaultOptions() {
41-
return (&__sancov_default_options) ? __sancov_default_options() : "";
42-
}
43-
4440
void InitializeSancovFlags() {
4541
SancovFlags *f = sancov_flags();
4642
f->SetDefaults();
4743

4844
FlagParser parser;
4945
RegisterSancovFlags(&parser, f);
5046

51-
parser.ParseString(MaybeCallSancovDefaultOptions());
47+
parser.ParseString(__sancov_default_options());
5248
parser.ParseStringFromEnv("SANCOV_OPTIONS");
5349

5450
ReportUnrecognizedFlags();

0 commit comments

Comments
 (0)