---

yaml --- r: 304847 b: refs/heads/master c: 97148a9 h: refs/heads/master i: 304845: 09dcc76 304843: 255f898 304839: d387b59 304831: 681c633 v: v3
git-mirror · Apr 20, 2012 · 735e6ab · 735e6ab
1 parent e679376
commit 735e6ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7e6ead7347813b5833efb9b32908c08ff131259
+refs/heads/master: 97148a97baf71536e15aa0acf3310b7b1409e2f4
diff --git a/trunk/tools/perf/ui/browsers/annotate.c b/trunk/tools/perf/ui/browsers/annotate.c
@@ -690,7 +690,15 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
 		bpos->idx = browser.nr_entries++;
 		if (pos->offset != -1) {
 			bpos->idx_asm = browser.nr_asm_entries++;
-			browser.offsets[pos->offset] = pos;
+			/*
+			 * FIXME: short term bandaid to cope with assembly
+			 * routines that comes with labels in the same column
+			 * as the address in objdump, sigh.
+			 *
+			 * E.g. copy_user_generic_unrolled
+ 			 */
+			if (pos->offset < (s64)size)
+				browser.offsets[pos->offset] = pos;
 		} else
 			bpos->idx_asm = -1;
 	}