2008-01-17 David Smith <dsmith@redhat.com>

	* tapsets.cxx
	(procfs_var_expanding_copy_visitor::visit_target_symbol): Print an
	error when trying to use the procfs target variable '$value' as an
	array or structure.

2 files changed, 30 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f9cbf04..61982312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+2008-01-17  David Smith  <dsmith@redhat.com>
+
+	* tapsets.cxx
+	(procfs_var_expanding_copy_visitor::visit_target_symbol): Print an
+	error when trying to use the procfs target variable '$value' as an
+	array or structure.
+
 2008-01-16  David Smith  <dsmith@redhat.com>
 
 	PR 5608.
-	* tapsets.cxx (visit_target_symbol): Print an error when trying to
-	use a marker argument as an array or structure.
+	* tapsets.cxx
+	(mark_var_expanding_copy_visitor::visit_target_symbol): Print an
+	error when trying to use a marker argument as an array or
+	structure.
 
 2008-01-16  Eugene Teo  <eteo@redhat.com>
 
diff --git a/tapsets.cxx b/tapsets.cxx
index b92344ba..89819d6e 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -4800,6 +4800,25 @@ procfs_var_expanding_copy_visitor::visit_target_symbol (target_symbol* e)
     throw semantic_error ("invalid target symbol for procfs probe, $value expected",
 			  e->tok);
 
+  if (e->components.size() > 0)
+    {
+      switch (e->components[0].first)
+	{
+	case target_symbol::comp_literal_array_index:
+	  throw semantic_error("procfs target variable '$value' may not be used as array",
+			       e->tok);
+	  break;
+	case target_symbol::comp_struct_member:
+	  throw semantic_error("procfs target variable '$value' may not be used as a structure",
+			       e->tok);
+	  break;
+	default:
+	  throw semantic_error ("invalid use of procfs target variable '$value'",
+				e->tok);
+	  break;
+	}
+    }
+
   bool lvalue = is_active_lvalue(e);
   if (write_probe && lvalue)
     throw semantic_error("procfs $value variable is read-only in a procfs write probe", e->tok);