---
 tracepoint.c |    1 +
 1 file changed, 1 insertion(+)

--- a/tracepoint.c
+++ b/tracepoint.c
@@ -3111,6 +3111,7 @@ find_matching_tracepoint (struct uploade
       if (b->type == utp->type
 	  && t->step_count == utp->step
 	  && t->pass_count == utp->pass
+	  && t->base.number == utp->number
 	  /* FIXME also test conditionals and actions.  */
 	  )
 	{