File tree 4 files changed +2
-18
lines changed
4 files changed +2
-18
lines changed Original file line number Diff line number Diff line change @@ -53,11 +53,6 @@ extern "C" {
53
53
// for the program it is linked into (if the return value is non-zero). This
54
54
// function must be defined as returning a constant value; any behavior beyond
55
55
// that is unsupported.
56
- int LeakSanitizerIsTurnedOffForTheCurrentProcess ();
57
-
58
- // Same as LeakSanitizerIsTurnedOffForTheCurrentProcess, but deprecated.
59
- // If both functions are defined only
60
- // LeakSanitizerIsTurnedOffForTheCurrentProcess is used.
61
56
int __lsan_is_turned_off ();
62
57
63
58
// This function may be optionally provided by the user and should return
Original file line number Diff line number Diff line change 9
9
int argc_copy;
10
10
11
11
extern " C" {
12
- int LeakSanitizerIsTurnedOffForTheCurrentProcess () {
12
+ int __lsan_is_turned_off () {
13
13
return (argc_copy == 1 );
14
14
}
15
15
}
Original file line number Diff line number Diff line change @@ -423,13 +423,8 @@ void DoLeakCheck() {
423
423
static bool already_done;
424
424
if (already_done) return ;
425
425
already_done = true ;
426
- if (&LeakSanitizerIsTurnedOffForTheCurrentProcess) {
427
- if (LeakSanitizerIsTurnedOffForTheCurrentProcess ())
426
+ if (&__lsan_is_turned_off && __lsan_is_turned_off ())
428
427
return ;
429
- } else if (&__lsan_is_turned_off) {
430
- if (__lsan_is_turned_off ())
431
- return ;
432
- }
433
428
434
429
DoLeakCheckParam param;
435
430
param.success = false ;
@@ -719,9 +714,5 @@ SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
719
714
int __lsan_is_turned_off () {
720
715
return 0 ;
721
716
}
722
- SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
723
- int LeakSanitizerIsTurnedOffForTheCurrentProcess () {
724
- return 0 ;
725
- }
726
717
#endif
727
718
} // extern "C"
Original file line number Diff line number Diff line change @@ -199,8 +199,6 @@ class LsanMetadata {
199
199
extern " C" {
200
200
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
201
201
int __lsan_is_turned_off ();
202
- SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
203
- int LeakSanitizerIsTurnedOffForTheCurrentProcess ();
204
202
205
203
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
206
204
const char *__lsan_default_suppressions ();
You can’t perform that action at this time.
0 commit comments