Skip to content

Commit a3d81c6

Browse files
committed
update valgrind suppressions
1 parent 928e3e4 commit a3d81c6

File tree

3 files changed

+28
-55
lines changed

3 files changed

+28
-55
lines changed

src/etc/apple-darwin.supp

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
{
22
osx-frameworks.rs-fails-otherwise-1
33
Memcheck:Leak
4-
match-leak-kinds: possible
4+
match-leak-kinds: definite,possible
55
fun:malloc
66
...
77
fun:__CFInitialize
8-
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
9-
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
10-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
11-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
12-
fun:_ZN11ImageLoader19processInitializersERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
13-
fun:_ZN11ImageLoader15runInitializersERKNS_11LinkContextERNS_21InitializerTimingListE
14-
fun:_ZN4dyld24initializeMainExecutableEv
8+
...
159
}
1610

1711
{
@@ -22,23 +16,17 @@
2216
...
2317
fun:__CFInitialize
2418
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
25-
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
26-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
27-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
28-
fun:_ZN11ImageLoader19processInitializersERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
2919
}
3020

3121
{
3222
osx-frameworks.rs-fails-otherwise-3
3323
Memcheck:Leak
3424
match-leak-kinds: possible
3525
fun:realloc
36-
fun:_ZL12realizeClassP10objc_class
37-
fun:_ZL12realizeClassP10objc_class
38-
fun:_ZN13list_array_ttIm15protocol_list_tE11attachListsEPKPS0_j
26+
...
3927
fun:_read_images
4028
fun:map_images_nolock
41-
fun:map_2_images
29+
...
4230
fun:_ZN4dyldL18notifyBatchPartialE17dyld_image_statesbPFPKcS0_jPK15dyld_image_infoE
4331
fun:_ZN4dyld36registerImageStateBatchChangeHandlerE17dyld_image_statesPFPKcS0_jPK15dyld_image_infoE
4432
fun:dyld_register_image_state_change_handler
@@ -49,7 +37,7 @@
4937
{
5038
osx-frameworks.rs-fails-otherwise-4
5139
Memcheck:Leak
52-
match-leak-kinds: possible
40+
match-leak-kinds: definite,possible
5341
fun:calloc
5442
...
5543
fun:__CFInitialize
@@ -61,45 +49,27 @@
6149
{
6250
osx-frameworks.rs-fails-otherwise-5
6351
Memcheck:Leak
64-
match-leak-kinds: definite
65-
fun:calloc
52+
match-leak-kinds: definite,possible
53+
fun:malloc_zone_malloc
6654
...
6755
fun:__CFInitialize
68-
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
69-
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
70-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
71-
}
72-
73-
{
74-
osx-frameworks.rs-fails-otherwise-6
75-
Memcheck:Leak
76-
match-leak-kinds: definite
77-
fun:malloc
78-
fun:strdup
79-
fun:_CFProcessPath
80-
fun:__CFInitialize
81-
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
82-
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
83-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
84-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
85-
fun:_ZN11ImageLoader19processInitializersERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
86-
fun:_ZN11ImageLoader15runInitializersERKNS_11LinkContextERNS_21InitializerTimingListE
87-
fun:_ZN4dyld24initializeMainExecutableEv
88-
fun:_ZN4dyld5_mainEPK12macho_headermiPPKcS5_S5_Pm
56+
...
8957
}
9058

9159
{
92-
osx-frameworks.rs-fails-otherwise-7
60+
fails-since-xcode-7.2
9361
Memcheck:Leak
94-
match-leak-kinds: definite
62+
match-leak-kinds: possible
9563
fun:malloc_zone_malloc
96-
...
97-
fun:__CFInitialize
98-
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
99-
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
100-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
101-
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
102-
fun:_ZN11ImageLoader19processInitializersERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
103-
fun:_ZN11ImageLoader15runInitializersERKNS_11LinkContextERNS_21InitializerTimingListE
104-
fun:_ZN4dyld24initializeMainExecutableEv
64+
fun:_objc_copyClassNamesForImage
65+
fun:_ZL9protocolsv
66+
fun:_Z9readClassP10objc_classbb
67+
fun:gc_init
68+
fun:_ZL33objc_initializeClassPair_internalP10objc_classPKcS0_S0_
69+
fun:layout_string_create
70+
fun:_ZL12realizeClassP10objc_class
71+
fun:_ZL22copySwiftV1MangledNamePKcb
72+
fun:_ZL22copySwiftV1MangledNamePKcb
73+
fun:_ZL22copySwiftV1MangledNamePKcb
74+
fun:_ZL22copySwiftV1MangledNamePKcb
10575
}

src/etc/x86.supp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
fun:tlv_finalize
1313
fun:_pthread_tsd_cleanup
1414
fun:_pthread_exit
15-
fun:_pthread_body
15+
...
1616
fun:_pthread_start
1717
fun:thread_start
1818
}
@@ -24,7 +24,7 @@
2424
fun:tlv_finalize
2525
fun:_pthread_tsd_cleanup
2626
fun:_pthread_exit
27-
fun:_pthread_body
27+
...
2828
fun:_pthread_start
2929
fun:thread_start
3030
}
@@ -36,7 +36,7 @@
3636
fun:tlv_finalize
3737
fun:_pthread_tsd_cleanup
3838
fun:_pthread_exit
39-
fun:_pthread_body
39+
...
4040
fun:_pthread_start
4141
fun:thread_start
4242
}
@@ -48,7 +48,7 @@
4848
fun:tlv_finalize
4949
fun:_pthread_tsd_cleanup
5050
fun:_pthread_exit
51-
fun:_pthread_body
51+
...
5252
fun:_pthread_start
5353
fun:thread_start
5454
}

src/test/run-pass-valgrind/exit-flushes.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-macos this needs valgrind 3.11 or higher; see
12+
// https://github.com/rust-lang/rust/pull/30365#issuecomment-165763679
13+
1114
use std::env;
1215
use std::process::{exit, Command};
1316

0 commit comments

Comments
 (0)