Skip to content

Commit 0e05549

Browse files
committed
Revert changes for objdump
Sadly it doesn't seem to be working.
1 parent 50162dd commit 0e05549

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

src/auditor/compiler_abi.jl

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Base.BinaryPlatforms: detect_libstdcxx_version, detect_cxxstring_abi
22
using ObjectFile
3-
using Binutils_jll: Binutils_jll
43

54
csl_warning(lib) = @lock AUDITOR_LOGGING_LOCK @warn(
65
"""
@@ -172,24 +171,15 @@ function cppfilt(symbol_names::Vector, platform::AbstractPlatform; strip_undersc
172171
seekstart(input)
173172

174173
output = IOBuffer()
175-
cmd = if Binutils_jll.is_available()
176-
ignorestatus(Binutils_jll.cxxfilt())
177-
else
178-
Cmd(`/opt/bin/$(triplet(platform))/c++filt`; ignorestatus=true)
179-
end
180-
if strip_underscore
181-
cmd = `$(cmd) --strip-underscore`
182-
end
183-
184-
if Binutils_jll.is_available()
185-
run(pipeline(cmd; stdin=input, stdout=output))
186-
else
187-
mktempdir() do dir
188-
# No need to acquire a sandbox lock here because we use a (hopefully)
189-
# different temporary directory for each run.
190-
ur = preferred_runner()(dir; cwd="/workspace/", platform=platform)
191-
run_interactive(ur, cmd; stdin=input, stdout=output)
174+
mktempdir() do dir
175+
# No need to acquire a sandbox lock here because we use a (hopefully)
176+
# different temporary directory for each run.
177+
ur = preferred_runner()(dir; cwd="/workspace/", platform=platform)
178+
cmd = Cmd(`/opt/bin/$(triplet(ur.platform))/c++filt`; ignorestatus=true)
179+
if strip_underscore
180+
cmd = `$(cmd) --strip-underscore`
192181
end
182+
run_interactive(ur, cmd; stdin=input, stdout=output)
193183
end
194184

195185
return filter!(s -> !isempty(s), split(String(take!(output)), "\n"))

0 commit comments

Comments
 (0)