From 8c2b6226f7ab867f9b55a655cd32018cec997df0 Mon Sep 17 00:00:00 2001 From: "Jeff R. Allen" Date: Wed, 13 Mar 2013 09:40:38 -0700 Subject: [PATCH] misc/pprof: fix address lookup regression on Linux Just use "go tool addr2line" no matter what, since we know it works for all OSs. Fixes #4818. R=rsc, r CC=golang-dev https://golang.org/cl/7526047 --- misc/pprof | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/misc/pprof b/misc/pprof index 1c66b87196..f471c73951 100755 --- a/misc/pprof +++ b/misc/pprof @@ -4417,11 +4417,9 @@ sub MapToSymbols { $cmd = "$addr2line --demangle -f -C -e $image"; } - if (system("$addr2line --help >/dev/null 2>&1") != 0) { - # addr2line must not exist. Fall back to go tool addr2line. - $addr2line = "go tool addr2line"; - $cmd = "$addr2line $image"; - } + # Use the go version because we know it works on all platforms + $addr2line = "go tool addr2line"; + $cmd = "$addr2line $image"; # If "addr2line" isn't installed on the system at all, just use # nm to get what info we can (function names, but not line numbers). -- 2.48.1