From 9fab2262961c9cd1ab3efea5d362b8a6a1c0c7c3 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 18 Mar 2010 15:39:42 -0700
Subject: PR11346: Move the skip-badvars logic into const-folding

The const_folder is where we prune constant expressions, like
conditionals based on a @defined($foo), so we want to give this a chance
to work before skip-badvars comes in and throws a warning.

As an added bonus, this makes skip-badvars more generic, so it will work
even for non-dwarf $target variables.

* elaborate.cxx (const_folder::visit_target_symbol): Enact skip-badvars.
* tapsets.cxx (dwarf_var_expanding_visitor::visit_target_symbol): Don't
  worry about badvars here anymore.  Save the error now, clean up later.
* testsuite/semok/badvar_undefined.stp: Test that @defined with
  skip-badvars doesn't throw any warnings.
---
 tapsets.cxx | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'tapsets.cxx')

diff --git a/tapsets.cxx b/tapsets.cxx
index 4b6a3781..886c2de5 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2613,34 +2613,17 @@ dwarf_var_expanding_visitor::visit_target_symbol (target_symbol *e)
     }
   catch (const semantic_error& er)
     {
-      // NB: @defined() should maintain the same behavior whether or not
-      // --skip-badvars is enabled, so don't zero its errors.  PR11346
-      if (!q.sess.skip_badvars || defined_being_checked)
-	{
-	  // We suppress this error message, and pass the unresolved
-	  // target_symbol to the next pass.  We hope that this value ends
-	  // up not being referenced after all, so it can be optimized out
-	  // quietly.
-	  provide (e);
-	  semantic_error* saveme = new semantic_error (er); // copy it
-          if (! saveme->tok1) { saveme->tok1 = e->tok; } // fill in token if needed
-	  // NB: we can have multiple errors, since a $target variable
-	  // may be expanded in several different contexts:
-	  //     function ("*") { $var }
-          e->chain (saveme);
-	}
-      else
-	{
-	  // Upon user request for ignoring context, the symbol is replaced
-	  // with a literal 0 and a warning message displayed
-	  literal_number* ln_zero = new literal_number (0);
-	  ln_zero->tok = e->tok;
-	  provide (ln_zero);
-          if (!q.sess.suppress_warnings)
-            q.sess.print_warning ("Bad $context variable being substituted with literal 0",
-                                  e->tok);
-	}
-      return;
+      // We suppress this error message, and pass the unresolved
+      // target_symbol to the next pass.  We hope that this value ends
+      // up not being referenced after all, so it can be optimized out
+      // quietly.
+      semantic_error* saveme = new semantic_error (er); // copy it
+      if (! saveme->tok1) { saveme->tok1 = e->tok; } // fill in token if needed
+      // NB: we can have multiple errors, since a $target variable
+      // may be expanded in several different contexts:
+      //     function ("*") { $var }
+      e->chain (saveme);
+      provide (e);
     }
 }
 
-- 
cgit