diff options
| author | Emmanuel T Odeke <emmanuel@orijtech.com> | 2022-07-29 22:38:24 -0600 |
|---|---|---|
| committer | Emmanuel Odeke <emmanuel@orijtech.com> | 2022-08-09 20:51:42 +0000 |
| commit | cd9cd925bb9ed79975f2531a6b84f69905e4fc31 (patch) | |
| tree | 24207b56cef60511da66930813fe8603a33df2a4 /src/cmd/vendor/github.com/google/pprof/internal/driver | |
| parent | 51a23d6681aef3736e09fbc61fc9ae03305efc2c (diff) | |
| download | go-cd9cd925bb9ed79975f2531a6b84f69905e4fc31.tar.xz | |
cmd: vendor github.com/google/pprof to fix mangled type parameter symbol names
Updates github.com/google/pprof to bring in the commit from
https://github.com/google/pprof/pull/717 which fixes mangled
symbol names for type parameters.
Fixes #54105
Change-Id: I01af9f780aba3338b960a03b30906a23642e4448
Reviewed-on: https://go-review.googlesource.com/c/go/+/420234
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Than McIntosh <thanm@google.com>
Diffstat (limited to 'src/cmd/vendor/github.com/google/pprof/internal/driver')
| -rw-r--r-- | src/cmd/vendor/github.com/google/pprof/internal/driver/settings.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cmd/vendor/github.com/google/pprof/internal/driver/settings.go b/src/cmd/vendor/github.com/google/pprof/internal/driver/settings.go index f72314b185..1e9154c5f5 100644 --- a/src/cmd/vendor/github.com/google/pprof/internal/driver/settings.go +++ b/src/cmd/vendor/github.com/google/pprof/internal/driver/settings.go @@ -79,7 +79,7 @@ type configMenuEntry struct { } // configMenu returns a list of items to add to a menu in the web UI. -func configMenu(fname string, url url.URL) []configMenuEntry { +func configMenu(fname string, u url.URL) []configMenuEntry { // Start with system configs. configs := []namedConfig{{Name: "Default", config: defaultConfig()}} if settings, err := readSettings(fname); err == nil { @@ -91,13 +91,15 @@ func configMenu(fname string, url url.URL) []configMenuEntry { result := make([]configMenuEntry, len(configs)) lastMatch := -1 for i, cfg := range configs { - dst, changed := cfg.config.makeURL(url) + dst, changed := cfg.config.makeURL(u) if !changed { lastMatch = i } + // Use a relative URL to work in presence of stripping/redirects in webui.go. + rel := &url.URL{RawQuery: dst.RawQuery, ForceQuery: true} result[i] = configMenuEntry{ Name: cfg.Name, - URL: dst.String(), + URL: rel.String(), UserConfig: (i != 0), } } |