The addr_location->addr should have relative address to be passed to
hist entry so that it can compare with others which might come from a
different address space.

The callchain_cursor_node->ip already has a relative address thus it
should not map it again.  But I found a bug handling cumulative
(children) entries.  For chilren entries that has no self period, the
al->addr (so he->ip) ends up having an doubly-mapped address.

It seems to be there from the beginning but only affects entries that
have no srclines - finding srcline itself is done using a different
address but it will show the invalid address if no srcline was found.

Tested-by: Milian Wolff <[email protected]>
Fixes: c7405d85d7a3 ("perf tools: Update cpumode for each cumulative entry")
Signed-off-by: Namhyung Kim <[email protected]>
---
 tools/perf/util/callchain.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 3a3916934a92..837012147c7b 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -1091,10 +1091,7 @@ int fill_callchain_info(struct addr_location *al, struct 
callchain_cursor_node *
        al->map = node->map;
        al->sym = node->sym;
        al->srcline = node->srcline;
-       if (node->map)
-               al->addr = node->map->map_ip(node->map, node->ip);
-       else
-               al->addr = node->ip;
+       al->addr = node->ip;
 
        if (al->sym == NULL) {
                if (hide_unresolved)
-- 
2.14.2

Reply via email to