PR5163: Assign need_uprobes during pass-2

We were doing this in pass-3, which means it was never set for cached
runs, and so staprun didn't get the -u flag.  Now need_probes is set as
soon as a uprobe_derived_probe is saved into the session in pass-2.

1 files changed, 4 insertions, 2 deletions

diff --git a/tapsets.cxx b/tapsets.cxx
index c81285e2..f6d73714 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -7500,6 +7500,10 @@ uprobe_derived_probe::join_group (systemtap_session& s)
     s.uprobe_derived_probes = new uprobe_derived_probe_group ();
   s.uprobe_derived_probes->enroll (this);
   task_finder_derived_probe_group::create_session_group (s);
+
+  // Ask buildrun.cxx to build extra module if needed, and
+  // signal staprun to load that module
+  s.need_uprobes = true;
 }
 
 
@@ -7532,8 +7536,6 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
   if (probes.empty()) return;
   s.op->newline() << "/* ---- user probes ---- */";
 
-  s.need_uprobes = true; // Ask buildrun.cxx to build extra module if needed
-
   // If uprobes isn't in the kernel, pull it in from the runtime.
   s.op->newline() << "#if defined(CONFIG_UPROBES) || defined(CONFIG_UPROBES_MODULE)";
   s.op->newline() << "#include <linux/uprobes.h>";