Skip to content

Commit 4afa9d9

Browse files
borsbors
committed
Auto merge of #29699 - tamird:valgrind-supp, r=alexcrichton
Quite a bit of cruft in the valgrind suppressions. I started from a clean slate and found a few unique failures; this commit also moves the tests "fixed" by these suppressions into run-pass-valgrind.
2 parents 4b23a09 + 269a811 commit 4afa9d9

File tree

7 files changed

+144
-479
lines changed

7 files changed

+144
-479
lines changed

‎mk/main.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ CFG_RUSTC_FLAGS := $(RUSTFLAGS)
111111
CFG_GCCISH_CFLAGS :=
112112
CFG_GCCISH_LINK_FLAGS :=
113113

114-
# Turn off broken quarantine (see jemalloc/jemalloc#161)
115-
CFG_JEMALLOC_FLAGS := --disable-fill
114+
CFG_JEMALLOC_FLAGS :=
116115

117116
ifdef CFG_DISABLE_OPTIMIZE
118117
$(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
@@ -184,7 +183,7 @@ include $(CFG_SRC_DIR)mk/platform.mk
184183

185184
# Run the stage1/2 compilers under valgrind
186185
ifdef VALGRIND_COMPILE
187-
CFG_VALGRIND_COMPILE :=$(CFG_VALGRIND)
186+
CFG_VALGRIND_COMPILE := $(CFG_VALGRIND)
188187
else
189188
CFG_VALGRIND_COMPILE :=
190189
endif
@@ -202,6 +201,7 @@ endif
202201

203202
ifdef CFG_ENABLE_VALGRIND
204203
$(info cfg: enabling valgrind (CFG_ENABLE_VALGRIND))
204+
CFG_JEMALLOC_FLAGS += --enable-valgrind
205205
else
206206
CFG_VALGRIND :=
207207
endif

‎src/etc/apple-darwin.supp

+100-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,105 @@
11
{
2-
issue_1333_setenv_leak
2+
osx-frameworks.rs-fails-otherwise-1
33
Memcheck:Leak
4-
fun:malloc_zone_malloc
4+
match-leak-kinds: possible
5+
fun:malloc
6+
...
7+
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
15+
}
16+
17+
{
18+
osx-frameworks.rs-fails-otherwise-2
19+
Memcheck:Leak
20+
match-leak-kinds: possible
21+
fun:malloc_zone_calloc
22+
...
23+
fun:__CFInitialize
24+
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
25+
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
26+
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
27+
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
28+
fun:_ZN11ImageLoader19processInitializersERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
29+
}
30+
31+
{
32+
osx-frameworks.rs-fails-otherwise-3
33+
Memcheck:Leak
34+
match-leak-kinds: possible
35+
fun:realloc
36+
fun:_ZL12realizeClassP10objc_class
37+
fun:_ZL12realizeClassP10objc_class
38+
fun:_ZN13list_array_ttIm15protocol_list_tE11attachListsEPKPS0_j
39+
fun:_read_images
40+
fun:map_images_nolock
41+
fun:map_2_images
42+
fun:_ZN4dyldL18notifyBatchPartialE17dyld_image_statesbPFPKcS0_jPK15dyld_image_infoE
43+
fun:_ZN4dyld36registerImageStateBatchChangeHandlerE17dyld_image_statesPFPKcS0_jPK15dyld_image_infoE
44+
fun:dyld_register_image_state_change_handler
45+
fun:_objc_init
46+
fun:_os_object_init
47+
}
48+
49+
{
50+
osx-frameworks.rs-fails-otherwise-4
51+
Memcheck:Leak
52+
match-leak-kinds: possible
53+
fun:calloc
554
...
6-
fun:setenv
7-
fun:setenv__c_stack_shim
55+
fun:__CFInitialize
56+
fun:_ZN16ImageLoaderMachO11doImageInitERKN11ImageLoader11LinkContextE
57+
fun:_ZN16ImageLoaderMachO16doInitializationERKN11ImageLoader11LinkContextE
58+
fun:_ZN11ImageLoader23recursiveInitializationERKNS_11LinkContextEjRNS_21InitializerTimingListERNS_15UninitedUpwardsE
59+
}
60+
61+
{
62+
osx-frameworks.rs-fails-otherwise-5
63+
Memcheck:Leak
64+
match-leak-kinds: definite
65+
fun:calloc
66+
...
67+
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
89+
}
90+
91+
{
92+
osx-frameworks.rs-fails-otherwise-7
93+
Memcheck:Leak
94+
match-leak-kinds: definite
95+
fun:malloc_zone_malloc
896
...
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
9105
}

0 commit comments

Comments
 (0)