2005-06-03 Frank Ch. Eigler <fche@elastic.org>

	* elaborate.cxx (find_*): Remove arity checks from here ...
	* staptree.cxx (set_arity): Put arity match assertion here.
	* testsuite/semko/{six,nine}.stp: Confirm logic.
	* testsuite/transko/one.stp: First translation-time ko test.

1 files changed, 11 insertions, 4 deletions

diff --git a/staptree.cxx b/staptree.cxx
index a8651d1d..756fbc1e 100644
--- a/staptree.cxx
+++ b/staptree.cxx
@@ -96,10 +96,17 @@ void
 vardecl::set_arity (int a)
 {
   assert (a >= 0);
-  arity = a;
-  index_types.resize (arity);
-  for (int i=0; i<arity; i++)
-    index_types[i] = pe_unknown;
+
+  if (arity != a && arity >= 0)
+    throw semantic_error ("inconsistent arity", tok);
+
+  if (arity != a)
+    {
+      arity = a;
+      index_types.resize (arity);
+      for (int i=0; i<arity; i++)
+	index_types[i] = pe_unknown;
+    }
 }