[OpenMP][NFC] Remove the need to include `OpenMPClause.h`

[rnk]

Summary

See rational here: https://reviews.llvm.org/D76173#1922916

[jdoerfert]

Finish changes

[rnk]

lgtm, thanks!

[rnk]

I patched this in with it's dependency, and to compile just Attr.h by itself, it reduces the time from ~2.420s to ~1.920s, so it is worth pushing this through. :)

However, I noticed that there are still some targets broken by the removal of the SmallSet.h include. I'm happy to push that through if you want to hand it off.

[jdoerfert]

In D76184#1927159, @rnk wrote:

I patched this in with it's dependency, and to compile just Attr.h by itself, it reduces the time from ~2.420s to ~1.920s, so it is worth pushing this through. :)

However, I noticed that there are still some targets broken by the removal of the SmallSet.h include. I'm happy to push that through if you want to hand it off.

I was about to push all three changes but I wans't aware of broken targets. Thx for telling me. I would not mind you talking over this patch. I'll merge the other two in a bit.

[jdoerfert]

In D76184#1927159, @rnk wrote:

I patched this in with it's dependency, and to compile just Attr.h by itself, it reduces the time from ~2.420s to ~1.920s, so it is worth pushing this through. :)

However, I noticed that there are still some targets broken by the removal of the SmallSet.h include. I'm happy to push that through if you want to hand it off.

I was about to push all three changes but I wans't aware of broken targets. Thx for telling me. I would not mind you talking over this patch. I'll merged the other two.

[jdoerfert]

@rnk What is the plan for this one now? Should I abandon it?

[rnk]

In D76184#1956352, @jdoerfert wrote:

@rnk What is the plan for this one now? Should I abandon it?

Sorry, I got distracted. I tried reapplying it but it didn't apply cleanly. It's possible I hadn't locally applied your patch series correctly when I said it wasn't compiling. If you can get clang (and clangd and clang-tools-extra) to compile with your change, feel free to push.

[rnk]

I got it building...

[rnk]

• seems to build all..

clang/include/clang/AST/Attr.h

 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_AST_ATTR_H
 #define LLVM_CLANG_AST_ATTR_H
 
 #include "clang/AST/ASTFwd.h"
 #include "clang/AST/AttrIterator.h"
 #include "clang/AST/Decl.h"
-#include "clang/AST/OpenMPClause.h"
 #include "clang/AST/Type.h"
 #include "clang/Basic/AttrKinds.h"
 #include "clang/Basic/AttributeCommonInfo.h"
+#include "clang/Basic/LangOptions.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/OpenMPKinds.h"
 #include "clang/Basic/Sanitizers.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/VersionTuple.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <cassert>
 
 namespace clang {
 class ASTContext;
 class AttributeCommonInfo;
 class IdentifierInfo;
 class ObjCInterfaceDecl;
 class Expr;
 class QualType;
 class FunctionDecl;
 class TypeSourceInfo;
+class OMPTraitInfo;
 
 /// Attr - This represents one attribute.
 class Attr : public AttributeCommonInfo {
 private:
   unsigned AttrKind : 16;
 
 protected:
   /// An index into the spelling list of an

clang/include/clang/AST/OpenMPClause.h

 public:
   OMPClausePrinter(raw_ostream &OS, const PrintingPolicy &Policy)
       : OS(OS), Policy(Policy) {}
 
 #define OPENMP_CLAUSE(Name, Class) void Visit##Class(Class *S);
 #include "clang/Basic/OpenMPKinds.def"
 };
 
-/// Helper data structure representing the traits in a match clause of an
-/// `declare variant` or `metadirective`. The outer level is an ordered
-/// collection of selector sets, each with an associated kind and an ordered
-/// collection of selectors. A selector has a kind, an optional score/condition,
-/// and an ordered collection of properties.
-class OMPTraitInfo {
-  /// Private constructor accesible only by ASTContext.
-  OMPTraitInfo() {}
-  friend class ASTContext;
-
-public:
-  struct OMPTraitProperty {
-    llvm::omp::TraitProperty Kind = llvm::omp::TraitProperty::invalid;
-  };
-  struct OMPTraitSelector {
-    Expr *ScoreOrCondition = nullptr;
-    llvm::omp::TraitSelector Kind = llvm::omp::TraitSelector::invalid;
-    llvm::SmallVector<OMPTraitProperty, 1> Properties;
-  };
-  struct OMPTraitSet {
-    llvm::omp::TraitSet Kind = llvm::omp::TraitSet::invalid;
-    llvm::SmallVector<OMPTraitSelector, 2> Selectors;
-  };
 
+/// Helper data structure representing the traits in a match clause of an
+/// `declare variant` or `metadirective`. The outer level is an ordered
+/// collection of selector sets, each with an associated kind and an ordered
+/// collection of selectors. A selector has a kind, an optional score/condition,
+/// and an ordered collection of properties.
+class OMPTraitInfo {
+  /// Private constructor accesible only by ASTContext.
+  OMPTraitInfo() {}
+  friend class ASTContext;
+
+public:
   /// The outermost level of selector sets.
   llvm::SmallVector<OMPTraitSet, 2> Sets;
 
   bool anyScoreOrCondition(
       const llvm::function_ref<bool(Expr *&, bool /* IsScore */)> &Cond) {
-    return llvm::any_of(Sets, [&Cond](OMPTraitInfo::OMPTraitSet &Set) {
+    return llvm::any_of(Sets, [&Cond](OMPTraitSet &Set) {
       return llvm::any_of(
-          Set.Selectors, [&Cond](OMPTraitInfo::OMPTraitSelector &Selector) {
+          Set.Selectors, [&Cond](OMPTraitSelector &Selector) {
             return Cond(Selector.ScoreOrCondition,
                         /* IsScore */ Selector.Kind !=
                             llvm::omp::TraitSelector::user_condition);
           });
     });
   }
 
   /// Create a variant match info object from this trait info object. While the

clang/include/clang/Parse/Parser.h

 //===--- Parser.h - C Language Parser ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 //  This file defines the Parser interface.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_PARSE_PARSER_H
 #define LLVM_CLANG_PARSE_PARSER_H
 
-#include "clang/AST/OpenMPClause.h"
 #include "clang/AST/Availability.h"
 #include "clang/Basic/BitmaskEnum.h"
 #include "clang/Basic/OpenMPKinds.h"
 #include "clang/Basic/OperatorPrecedence.h"
 #include "clang/Basic/Specifiers.h"
 #include "clang/Lex/CodeCompletionHandler.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Sema/DeclSpec.h"
namespace clang {
   class ParsingDeclarator;
   class ParsingFieldDeclarator;
   class ColonProtectionRAIIObject;
   class InMessageExpressionRAIIObject;
   class PoisonSEHIdentifiersRAIIObject;
   class OMPClause;
   class ObjCTypeParamList;
   class ObjCTypeParameter;
+  struct OMPTraitProperty;
+  struct OMPTraitSelector;
+  struct OMPTraitSet;
+  class OMPTraitInfo;
 
 /// Parser - This implements a parser for the C family of languages.  After
 /// parsing units of the grammar, productions are invoked to handle whatever has
 /// been read.
 ///
 class Parser : public CodeCompletionHandler {
   friend class ColonProtectionRAIIObject;
   friend class ParsingOpenMPDirectiveRAII;
private:
   // OpenMP: Directives and clauses.
   /// Parse clauses for '#pragma omp declare simd'.
   DeclGroupPtrTy ParseOMPDeclareSimdClauses(DeclGroupPtrTy Ptr,
                                             CachedTokens &Toks,
                                             SourceLocation Loc);
 
   /// Parse a property kind into \p TIProperty for the selector set \p Set and
   /// selector \p Selector.
-  void parseOMPTraitPropertyKind(OMPTraitInfo::OMPTraitProperty &TIProperty,
+  void parseOMPTraitPropertyKind(OMPTraitProperty &TIProperty,
                                  llvm::omp::TraitSet Set,
                                  llvm::omp::TraitSelector Selector,
                                  llvm::StringMap<SourceLocation> &Seen);
 
   /// Parse a selector kind into \p TISelector for the selector set \p Set.
-  void parseOMPTraitSelectorKind(OMPTraitInfo::OMPTraitSelector &TISelector,
+  void parseOMPTraitSelectorKind(OMPTraitSelector &TISelector,
                                  llvm::omp::TraitSet Set,
                                  llvm::StringMap<SourceLocation> &Seen);
 
   /// Parse a selector set kind into \p TISet.
-  void parseOMPTraitSetKind(OMPTraitInfo::OMPTraitSet &TISet,
+  void parseOMPTraitSetKind(OMPTraitSet &TISet,
                             llvm::StringMap<SourceLocation> &Seen);
 
   /// Parses an OpenMP context property.
-  void parseOMPContextProperty(OMPTraitInfo::OMPTraitSelector &TISelector,
+  void parseOMPContextProperty(OMPTraitSelector &TISelector,
                                llvm::omp::TraitSet Set,
                                llvm::StringMap<SourceLocation> &Seen);
 
   /// Parses an OpenMP context selector.
-  void parseOMPContextSelector(OMPTraitInfo::OMPTraitSelector &TISelector,
+  void parseOMPContextSelector(OMPTraitSelector &TISelector,
                                llvm::omp::TraitSet Set,
                                llvm::StringMap<SourceLocation> &SeenSelectors);
 
   /// Parses an OpenMP context selector set.
-  void parseOMPContextSelectorSet(OMPTraitInfo::OMPTraitSet &TISet,
+  void parseOMPContextSelectorSet(OMPTraitSet &TISet,
                                   llvm::StringMap<SourceLocation> &SeenSets);
 
   /// Parses OpenMP context selectors.
   bool parseOMPContextSelectors(SourceLocation Loc, OMPTraitInfo &TI);
 
   /// Parse clauses for '#pragma omp declare variant'.
   void ParseOMPDeclareVariantClauses(DeclGroupPtrTy Ptr, CachedTokens &Toks,
                                      SourceLocation Loc);

clang/lib/AST/OpenMPClause.cpp

for (const OMPTraitSelector &Selector : Set.Selectors) {
       VMI.ConstructTraits.push_back(Selector.Properties.front().Kind);
     }
   }
 }
 
 void OMPTraitInfo::print(llvm::raw_ostream &OS,
                          const PrintingPolicy &Policy) const {
   bool FirstSet = true;
-  for (const OMPTraitInfo::OMPTraitSet &Set : Sets) {
+  for (const OMPTraitSet &Set : Sets) {
     if (!FirstSet)
       OS << ", ";
     FirstSet = false;
     OS << llvm::omp::getOpenMPContextTraitSetName(Set.Kind) << "={";
 
     bool FirstSelector = true;
-    for (const OMPTraitInfo::OMPTraitSelector &Selector : Set.Selectors) {
+    for (const OMPTraitSelector &Selector : Set.Selectors) {
       if (!FirstSelector)
         OS << ", ";
       FirstSelector = false;
       OS << llvm::omp::getOpenMPContextTraitSelectorName(Selector.Kind);
 
       bool AllowsTraitScore = false;
       bool RequiresProperty = false;
       llvm::omp::isValidTraitSelectorForTraitSet(
for (const OMPTraitSelector &Selector : Set.Selectors) {
 
         if (Selector.ScoreOrCondition) {
           OS << "score(";
           Selector.ScoreOrCondition->printPretty(OS, nullptr, Policy);
           OS << "): ";
         }
 
         bool FirstProperty = true;
-        for (const OMPTraitInfo::OMPTraitProperty &Property :
+        for (const OMPTraitProperty &Property :
              Selector.Properties) {
           if (!FirstProperty)
             OS << ", ";
           FirstProperty = false;
           OS << llvm::omp::getOpenMPContextTraitPropertyName(Property.Kind);
         }
       }
       OS << ")";

clang/lib/Parse/ParseOpenMP.cpp

 //===--- ParseOpenMP.cpp - OpenMP directives parsing ----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 /// \file
 /// This file implements parsing of all OpenMP directives and clauses.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/OpenMPClause.h"
 #include "clang/AST/StmtOpenMP.h"
 #include "clang/Basic/OpenMPKinds.h"
 #include "clang/Parse/ParseDiagnostic.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/RAIIObjectsForParser.h"
 #include "clang/Sema/Scope.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/UniqueVector.h"
P.Diag(NameLoc, diag::warn_omp_declare_variant_ctx_mutiple_use)
       << Lvl << Name;
   P.Diag(Res.first->getValue(), diag::note_omp_declare_variant_ctx_used_here)
       << Lvl << Name;
   return true;
 }
 } // namespace
 
 void Parser::parseOMPTraitPropertyKind(
-    OMPTraitInfo::OMPTraitProperty &TIProperty, llvm::omp::TraitSet Set,
+    OMPTraitProperty &TIProperty, llvm::omp::TraitSet Set,
     llvm::omp::TraitSelector Selector, llvm::StringMap<SourceLocation> &Seen) {
   TIProperty.Kind = TraitProperty::invalid;
 
   SourceLocation NameLoc = Tok.getLocation();
   StringRef Name =
       getNameFromIdOrString(*this, Tok, CONTEXT_TRAIT_LVL);
   if (Name.empty()) {
     Diag(Tok.getLocation(), diag::note_omp_declare_variant_ctx_options)
Diag(NameLoc, diag::note_omp_declare_variant_ctx_try)
                getOpenMPContextTraitSelectorForProperty(PropertyForName))
         << ("(" + Name + ")").str();
     return;
   }
   Diag(NameLoc, diag::note_omp_declare_variant_ctx_options)
       << CONTEXT_TRAIT_LVL << listOpenMPContextTraitProperties(Set, Selector);
 }
 
-void Parser::parseOMPContextProperty(OMPTraitInfo::OMPTraitSelector &TISelector,
+void Parser::parseOMPContextProperty(OMPTraitSelector &TISelector,
                                      llvm::omp::TraitSet Set,
                                      llvm::StringMap<SourceLocation> &Seen) {
   assert(TISelector.Kind != TraitSelector::user_condition &&
          "User conditions are special properties not handled here!");
 
   SourceLocation PropertyLoc = Tok.getLocation();
-  OMPTraitInfo::OMPTraitProperty TIProperty;
+  OMPTraitProperty TIProperty;
   parseOMPTraitPropertyKind(TIProperty, Set, TISelector.Kind, Seen);
 
   // If we have an invalid property here we already issued a warning.
   if (TIProperty.Kind == TraitProperty::invalid) {
     if (PropertyLoc != Tok.getLocation())
       Diag(Tok.getLocation(), diag::note_omp_declare_variant_ctx_continue_here)
           << CONTEXT_TRAIT_LVL;
     return;
Diag(PropertyLoc, diag::note_omp_ctx_compatible_set_and_selector_for_property)
              getOpenMPContextTraitSelectorForProperty(TIProperty.Kind))
       << getOpenMPContextTraitSetName(
              getOpenMPContextTraitSetForProperty(TIProperty.Kind));
   Diag(Tok.getLocation(), diag::note_omp_declare_variant_ctx_continue_here)
       << CONTEXT_TRAIT_LVL;
 }
 
 void Parser::parseOMPTraitSelectorKind(
-    OMPTraitInfo::OMPTraitSelector &TISelector, llvm::omp::TraitSet Set,
+    OMPTraitSelector &TISelector, llvm::omp::TraitSet Set,
     llvm::StringMap<SourceLocation> &Seen) {
   TISelector.Kind = TraitSelector::invalid;
 
   SourceLocation NameLoc = Tok.getLocation();
   StringRef Name = getNameFromIdOrString(*this, Tok, CONTEXT_SELECTOR_LVL
                     );
   if (Name.empty()) {
     Diag(Tok.getLocation(), diag::note_omp_declare_variant_ctx_options)
P.Diag(P.getCurToken(), diag::warn_omp_declare_variant_expected)
         << "score expression";
   return ScoreExpr;
 }
 
 /// Parses an OpenMP context selector.
 ///
 /// <trait-selector-name> ['('[<trait-score>] <trait-property> [, <t-p>]* ')']
 void Parser::parseOMPContextSelector(
-    OMPTraitInfo::OMPTraitSelector &TISelector, llvm::omp::TraitSet Set,
+    OMPTraitSelector &TISelector, llvm::omp::TraitSet Set,
     llvm::StringMap<SourceLocation> &SeenSelectors) {
   unsigned short OuterPC = ParenCount;
 
   // If anything went wrong we issue an error or warning and then skip the rest
   // of the selector. However, commas are ambiguous so we look for the nesting
   // of parentheses here as well.
   auto FinishSelector = [OuterPC, this]() -> void {
     bool Done = false;
void Parser::parseOMPContextSelector(
   do {
     parseOMPContextProperty(TISelector, Set, SeenProperties);
   } while (TryConsumeToken(tok::comma));
 
   // Parse ')'.
   BDT.consumeClose();
 }
 
-void Parser::parseOMPTraitSetKind(OMPTraitInfo::OMPTraitSet &TISet,
+void Parser::parseOMPTraitSetKind(OMPTraitSet &TISet,
                                   llvm::StringMap<SourceLocation> &Seen) {
   TISet.Kind = TraitSet::invalid;
 
   SourceLocation NameLoc = Tok.getLocation();
   StringRef Name = getNameFromIdOrString(*this, Tok, CONTEXT_SELECTOR_SET_LVL
                    );
   if (Name.empty()) {
     Diag(Tok.getLocation(), diag::note_omp_declare_variant_ctx_options)
void Parser::parseOMPTraitSetKind(OMPTraitSet &TISet,
   Diag(NameLoc, diag::note_omp_declare_variant_ctx_options)
       << CONTEXT_SELECTOR_SET_LVL << listOpenMPContextTraitSets();
 }
 
 /// Parses an OpenMP context selector set.
 ///
 /// <trait-set-selector-name> '=' '{' <trait-selector> [, <trait-selector>]* '}'
 void Parser::parseOMPContextSelectorSet(
-    OMPTraitInfo::OMPTraitSet &TISet,
+    OMPTraitSet &TISet,
     llvm::StringMap<SourceLocation> &SeenSets) {
   auto OuterBC = BraceCount;
 
   // If anything went wrong we issue an error or warning and then skip the rest
   // of the set. However, commas are ambiguous so we look for the nesting
   // of braces here as well.
   auto FinishSelectorSet = [this, OuterBC]() -> void {
     bool Done = false;
Diag(Tok.getLocation(), diag::warn_omp_declare_variant_expected)
         << "{"
         << ("'=' that follows the context set name \"" +
             getOpenMPContextTraitSetName(TISet.Kind) + "\"")
                .str();
   }
 
   llvm::StringMap<SourceLocation> SeenSelectors;
   do {
-    OMPTraitInfo::OMPTraitSelector TISelector;
+    OMPTraitSelector TISelector;
     parseOMPContextSelector(TISelector, TISet.Kind, SeenSelectors);
     if (TISelector.Kind != TraitSelector::invalid &&
         !TISelector.Properties.empty())
       TISet.Selectors.push_back(TISelector);
   } while (TryConsumeToken(tok::comma));
 
   // Parse '}'.
   if (Tok.is(tok::r_brace)) {
     (void)ConsumeBrace();
   } else {
     Diag(Tok.getLocation(), diag::warn_omp_declare_variant_expected)
         << "}"
         << ("context selectors for the context set \"" +
             getOpenMPContextTraitSetName(TISet.Kind) + "\"")
                .str();
   }
 }
 
 /// Parse OpenMP context selectors:
 ///
 /// <trait-set-selector> [, <trait-set-selector>]*
-bool Parser::parseOMPContextSelectors(SourceLocation Loc, OMPTraitInfo &TI) {
+bool Parser::parseOMPContextSelectors(SourceLocation Loc, OMPTraitInfo& TI) {
   llvm::StringMap<SourceLocation> SeenSets;
   do {
-    OMPTraitInfo::OMPTraitSet TISet;
+    OMPTraitSet TISet;
     parseOMPContextSelectorSet(TISet, SeenSets);
     if (TISet.Kind != TraitSet::invalid && !TISet.Selectors.empty())
       TI.Sets.push_back(TISet);
   } while (TryConsumeToken(tok::comma));
 
   return false;
 }