From 69aa668e25e8d2e7632b794d106d239aceff4733 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Sun, 6 May 2012 22:10:52 -0400
Subject: [PATCH] toolshed name change: vardecl::skip_init->synthetic

* staptree.h (vardecl::skip_init): Rename field to "synthetic".
  Update all users.
---
 elaborate.cxx        | 4 ++--
 staptree.cxx         | 2 +-
 staptree.h           | 2 +-
 tapset-mark.cxx      | 2 +-
 tapset-netfilter.cxx | 4 ++--
 tapsets.cxx          | 2 +-
 translate.cxx        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/elaborate.cxx b/elaborate.cxx
index 20ded75d3..c7653a038 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -2132,7 +2132,7 @@ void semantic_pass_opt2 (systemtap_session& s, bool& relaxed_p, unsigned iterati
         vardecl* l = s.probes[i]->locals[j];
 
         // skip over "special" locals
-        if (l->skip_init) { j++; continue; }
+        if (l->synthetic) { j++; continue; }
 
         if (vut.read.find (l) == vut.read.end() &&
             vut.written.find (l) == vut.written.end())
@@ -2299,7 +2299,7 @@ dead_assignment_remover::visit_assignment (assignment* e)
           varuse_collecting_visitor lvut(session);
           e->left->visit (& lvut);
           if (lvut.side_effect_free () && !is_global // XXX: use _wrt() once we track focal_vars
-              && !leftvar->skip_init) // don't elide assignment to synthetic $context variables
+              && !leftvar->synthetic) // don't elide assignment to synthetic $context variables
             {
               /* PR 1119: NB: This is not necessary here.  A write-only
                  variable will also be elided soon at the next _opt2 iteration.
diff --git a/staptree.cxx b/staptree.cxx
index a54f57fa4..da3deec27 100644
--- a/staptree.cxx
+++ b/staptree.cxx
@@ -146,7 +146,7 @@ probe_point::component::component (std::string const & f, literal * a):
 
 
 vardecl::vardecl ():
-  arity_tok(0), arity (-1), maxsize(0), init(NULL), skip_init(false), wrap(false)
+  arity_tok(0), arity (-1), maxsize(0), init(NULL), synthetic(false), wrap(false)
 {
 }
 
diff --git a/staptree.h b/staptree.h
index 922fab899..ea3b6544f 100644
--- a/staptree.h
+++ b/staptree.h
@@ -498,7 +498,7 @@ struct vardecl: public symboldecl
   int maxsize; // upperbound on size for arrays
   std::vector<exp_type> index_types; // for arrays only
   literal *init; // for global scalars only
-  bool skip_init; // for probe locals only, don't init on entry
+  bool synthetic; // for probe locals only, don't init on entry
   bool wrap;
 };
 
diff --git a/tapset-mark.cxx b/tapset-mark.cxx
index b06cbeecb..f97da9c73 100644
--- a/tapset-mark.cxx
+++ b/tapset-mark.cxx
@@ -233,7 +233,7 @@ mark_derived_probe::mark_derived_probe (systemtap_session &s,
 	v->tok = this->tok;
 	v->set_arity(0, this->tok);
 	v->type = mark_args[i]->stp_type;
-	v->skip_init = true;
+	v->synthetic = true;
 	this->locals.push_back (v);
       }
 
diff --git a/tapset-netfilter.cxx b/tapset-netfilter.cxx
index 78b144dd4..e9d9fc0d8 100644
--- a/tapset-netfilter.cxx
+++ b/tapset-netfilter.cxx
@@ -101,7 +101,7 @@ netfilter_derived_probe::netfilter_derived_probe (systemtap_session &s, probe* p
   v.replace (this->body);
 
   // Create probe-local vardecls, before symbol resolution might make
-  // one for us, so that we can set the all-important skip_init flag.
+  // one for us, so that we can set the all-important synthetic flag.
   for (set<string>::iterator it = v.context_vars.begin();
        it != v.context_vars.end();
        it++)
@@ -113,7 +113,7 @@ netfilter_derived_probe::netfilter_derived_probe (systemtap_session &s, probe* p
       v->tok = this->tok; /* XXX: but really the $context var. */
       v->set_arity (0, this->tok);
       v->type = pe_long;
-      v->skip_init = true; // suppress rvalue or lvalue optimizations
+      v->synthetic = true; // suppress rvalue or lvalue optimizations
       this->locals.push_back (v);
     }
 }
diff --git a/tapsets.cxx b/tapsets.cxx
index b882107d8..da4a12d93 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -8888,7 +8888,7 @@ tracepoint_derived_probe::tracepoint_derived_probe (systemtap_session& s,
 	v->tok = this->tok;
 	v->set_arity(0, this->tok);
 	v->type = pe_long;
-	v->skip_init = true;
+	v->synthetic = true;
 	this->locals.push_back (v);
       }
 
diff --git a/translate.cxx b/translate.cxx
index 85148e7fe..48aac6958 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -2116,7 +2116,7 @@ c_unparser::emit_probe (derived_probe* v)
       // initialize locals
       for (unsigned j=0; j<v->locals.size(); j++)
         {
-	  if (v->locals[j]->skip_init)
+	  if (v->locals[j]->synthetic)
             continue;
 	  if (v->locals[j]->index_types.size() > 0) // array?
             throw semantic_error (_("array locals not supported, missing global declaration?"),
-- 
2.43.5