[PATCH] perf diff: bug fix, donot overwrite build id in dso__load

[PATCH] perf diff: bug fix, donot overwrite build id in dso__load

[kan.liang]

From: Kan Liang <kan.liang@intel.com>

This patch fixes a perf diff regression issue which was introduced by:
commit 5baecbcd9c9a ("perf symbols: we can now read separate debug-info
files based on a build ID")

The binary name could be same when perf diff different binaries. Build
id is used to distinguish between them. The unique build id will be set
when processing the header.
However, the previous patch relies on binary name to find build id.
Furthermore, it overwrites the build id regardless of whether the build
id is set or not. That will bring issue when perf diff different
binaries.

This patch prevent the overwrite by checking has_build_id.

Signed-off-by: Kan Liang <kan.liang@intel.com>
---
 tools/perf/util/symbol.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 19c9c55..2392c03 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1444,7 +1444,8 @@ int dso__load(struct dso *dso, struct map *map)
 	 * Read the build id if possible. This is required for
 	 * DSO_BINARY_TYPE__BUILDID_DEBUGINFO to work
 	 */
-	if (is_regular_file(dso->long_name) &&
+	if (!dso->has_build_id &&
+	    is_regular_file(dso->long_name) &&
 	    filename__read_build_id(dso->long_name, build_id, BUILD_ID_SIZE) > 0)
 		dso__set_build_id(dso, build_id);
 
-- 
2.5.5