2006-01-10 Frank Ch. Eigler <fche@redhat.com>

	PR 1972.
	* tapsets.cxx (var_expanding_copy_visitor::visit_target_symbol):
	Produce error message for $var access within .return probes.
	* testsuite/semko/thirtyfour.stp: New test.

diff --git a/ChangeLog b/ChangeLog
index 1178c45607a5bcb5508f52f8237c05905eb47ecc..4e2ca0a7cae3053cc25f2fdbe5d44c03e85c916c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-10  Frank Ch. Eigler  <fche@redhat.com>
+
+       PR 1972.
+       * tapsets.cxx (var_expanding_copy_visitor::visit_target_symbol):
+       Produce error message for $var access within .return probes.
+       * testsuite/semko/thirtyfour.stp: New test.
+
 2006-01-10  Frank Ch. Eigler  <fche@redhat.com>
 
        PR 2060.

diff --git a/tapsets.cxx b/tapsets.cxx
index 57429cbd51774d217814dc3419f2ac677907e126..0ad6d5cff53a733c048c1c52e92f2c5c1d9a2591 100644 (file)
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2616,12 +2616,15 @@ var_expanding_copy_visitor::visit_target_symbol (target_symbol *e)
   bool lvalue = is_active_lvalue(e);
 
   if (lvalue && !q.sess.guru_mode)
-    throw semantic_error("Illegal target variable access", e->tok);
+    throw semantic_error("write to target variable not permitted", e->tok);
 
   string fname = (string(lvalue ? "set" : "get")
                  + "_" + e->base_name.substr(1)
                  + "_" + lex_cast<string>(tick++));
 
+  if (q.has_return)
+    throw semantic_error ("target variables not available to .return probes");
+
   try
     {
       ec->code = q.dw.literal_stmt_for_local (scope_die,

diff --git a/testsuite/semko/thirtyfour.stp b/testsuite/semko/thirtyfour.stp
new file mode 100755 (executable)
index 0000000..6d9a67d
--- /dev/null
+++ b/testsuite/semko/thirtyfour.stp
@@ -0,0 +1,3 @@
+#! stap -p2
+
+probe kernel.function("sys_open").return { $filename }