PR20416 cont'd: kprobe.function.return @entry too

Bonus round: jistone identified a twin in need of the same fix.

diff --git a/tapsets.cxx b/tapsets.cxx
index c1ffb6b4412939f0ac300aa5950076816a0ab66f..da5a5af5d6bd96bc18e9fb90bb160a4aaf48acc6 100644 (file)
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -9901,11 +9901,7 @@ kprobe_var_expanding_visitor::visit_entry_op (entry_op *e)
 
   if (has_return)
     {
-      // expand the operand as if it weren't a return probe
-      has_return = false;
-      replace (e->operand);
-      has_return = true;
-
+      // see also PR20416
       // XXX it would be nice to use gen_kretprobe_saved_return when
       // available, but it requires knowing the types already, which is
       // problematic for arbitrary expressons.