temp

Author: Villosse

gcc/rust/checks/errors/feature/rust-feature-gate.cc

@@ -39,10 +39,16 @@ FeatureGate::visit (AST::Crate &crate)
 
   // avoid clearing defined features (?)
 
+  rust_debug ("FeatureGate: checking %lu crate inner attributes",
+	      (unsigned long) crate.inner_attrs.size ());
   for (const auto &attr : crate.inner_attrs)
     {
+      rust_debug ("FeatureGate: checking attr: %s",
+		  attr.get_path ().as_string ().c_str ());
       if (attr.get_path ().as_string () == "feature")
 	{
+	  rust_debug ("FeatureGate: found feature attr: %s",
+		      attr.as_string ().c_str ());
 	  // check for empty feature, such as `#![feature], this is an error
 	  if (attr.empty_input ())
 	    {
@@ -52,6 +58,9 @@ FeatureGate::visit (AST::Crate &crate)
 	    }
 	  const auto &attr_input = attr.get_attr_input ();
 	  auto type = attr_input.get_attr_input_type ();
+	  rust_debug ("FeatureGate: attr input type: %d (TOKEN_TREE=%d)",
+		      (int) type,
+		      (int) AST::AttrInput::AttrInputType::TOKEN_TREE);
 	  if (type == AST::AttrInput::AttrInputType::TOKEN_TREE)
 	    {
 	      const auto &option = static_cast<const AST::DelimTokenTree &> (
@@ -64,9 +73,41 @@ FeatureGate::visit (AST::Crate &crate)
 
 		  // TODO: detect duplicates
 		  if (auto tname = Feature::as_name (name_str))
-		    valid_lang_features.insert (tname.value ());
+		    {
+		      rust_debug ("FeatureGate: adding lang feature: %s",
+				  name_str.c_str ());
+		      valid_lang_features.insert (tname.value ());
+		    }
 		  else
-		    valid_lib_features.emplace (name_str, item->get_locus ());
+		    {
+		      rust_debug ("FeatureGate: adding lib feature: %s",
+				  name_str.c_str ());
+		      valid_lib_features.emplace (name_str, item->get_locus ());
+		    }
+		}
+	    }
+	  else if (type == AST::AttrInput::AttrInputType::META_ITEM)
+	    {
+	      const auto &meta_item
+		= static_cast<const AST::AttrInputMetaItemContainer &> (
+		  attr_input);
+	      for (const auto &item : meta_item.get_items ())
+		{
+		  const auto &name_str = item->as_string ();
+
+		  // TODO: detect duplicates
+		  if (auto tname = Feature::as_name (name_str))
+		    {
+		      rust_debug ("FeatureGate: adding lang feature: %s",
+				  name_str.c_str ());
+		      valid_lang_features.insert (tname.value ());
+		    }
+		  else
+		    {
+		      rust_debug ("FeatureGate: adding lib feature: %s",
+				  name_str.c_str ());
+		      valid_lib_features.emplace (name_str, item->get_locus ());
+		    }
 		}
 	    }
 	}

gcc/rust/expand/rust-cfg-strip.cc

@@ -107,23 +107,44 @@ expand_cfg_attrs (AST::AttrVec &attrs)
   for (std::size_t i = 0; i < attrs.size (); i++)
     {
       auto &attr = attrs[i];
+      rust_debug ("expand_cfg_attrs: checking attr: %s",
+		  attr.get_path ().as_string ().c_str ());
       if (attr.get_path () == Values::Attributes::CFG_ATTR)
 	{
+	  rust_debug ("expand_cfg_attrs: found cfg_attr: %s",
+		      attr.as_string ().c_str ());
 	  if (!attr.is_parsed_to_meta_item ())
 	    attr.parse_attr_to_meta_item ();
 
 	  if (attr.check_cfg_predicate (session))
 	    {
+	      rust_debug ("expand_cfg_attrs: cfg_attr predicate is true, "
+			  "expanding");
 	      // split off cfg_attr
 	      AST::AttrVec new_attrs = attr.separate_cfg_attrs ();
 
+	      rust_debug ("expand_cfg_attrs: got %lu new attrs",
+			  (unsigned long) new_attrs.size ());
+	      for (const auto &new_attr : new_attrs)
+		rust_debug ("  new attr: %s", new_attr.as_string ().c_str ());
+
 	      // remove attr from vector
 	      attrs.erase (attrs.begin () + i);
 
 	      // add new attrs to vector
 	      attrs.insert (attrs.begin () + i,
 			    std::make_move_iterator (new_attrs.begin ()),
 			    std::make_move_iterator (new_attrs.end ()));
+
+	      // Decrement i so that the for loop's i++ will bring us back to
+	      // position i, allowing us to reprocess the newly inserted
+	      // attribute (in case it's also a cfg_attr that needs expansion)
+	      i--;
+	    }
+	  else
+	    {
+	      rust_debug ("expand_cfg_attrs: cfg_attr predicate is false, "
+			  "skipping");
 	    }
 
 	  /* do something - if feature (first token in tree) is in fact enabled,
@@ -133,10 +154,6 @@ expand_cfg_attrs (AST::AttrVec &attrs)
 	   * recursive, so check for expanded attributes being recursive and
 	   * possibly recursively call the expand_attrs? */
 	}
-      else
-	{
-	  i++;
-	}
     }
   attrs.shrink_to_fit ();
 }