Adding comments for the new data member and removing usage of magic numbers

Author: Ritanya-B-Bharadwaj

clang/include/clang/Sema/SemaOpenMP.h

@@ -1491,8 +1491,10 @@ class SemaOpenMP : public SemaBase {
   /// All `omp assumes` we encountered so far.
   SmallVector<OMPAssumeAttr *, 4> OMPAssumeGlobal;
 
+  /// Device number specified by the context selector.
   int DeviceNum = -1;
 
+  /// Device number identifier specified by the context selector.
   StringRef DeviceNumID;
 };
 

clang/lib/Parse/ParseOpenMP.cpp

@@ -893,7 +893,7 @@ void Parser::parseOMPTraitPropertyKind(OMPTraitProperty &TIProperty,
     Name = "number";
     TIProperty.Kind = getOpenMPContextTraitPropertyKind(Set, Selector, Name);
     ExprResult DeviceNumExprResult = ParseExpression();
-    if (!DeviceNumExprResult.isInvalid()) {
+    if (DeviceNumExprResult.isUsable()) {
       Expr *DeviceNumExpr = DeviceNumExprResult.get();
       Actions.OpenMP().ActOnOpenMPDeviceNum(DeviceNumExpr);
     }
@@ -2266,7 +2266,8 @@ Parser::DeclGroupPtrTy Parser::ParseOpenMPDeclarativeDirectiveWithExtDecl(
     TargetOMPContext OMPCtx(
         ASTCtx, std::move(DiagUnknownTrait),
         /* CurrentFunctionDecl */ nullptr,
-        /* ConstructTraits */ ArrayRef<llvm::omp::TraitProperty>(), -1);
+        /* ConstructTraits */ ArrayRef<llvm::omp::TraitProperty>(),
+        Actions.OpenMP().getOpenMPDeviceNum());
 
     if (isVariantApplicableInContext(VMI, OMPCtx, /* DeviceSetOnly */ true)) {
       Actions.OpenMP().ActOnOpenMPBeginDeclareVariant(Loc, TI);
@@ -2818,7 +2819,8 @@ StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective(
         };
     TargetOMPContext OMPCtx(ASTContext, std::move(DiagUnknownTrait),
                             /* CurrentFunctionDecl */ nullptr,
-                            ArrayRef<llvm::omp::TraitProperty>(), -1);
+                            ArrayRef<llvm::omp::TraitProperty>(),
+                            Actions.OpenMP().getOpenMPDeviceNum());
 
     // A single match is returned for OpenMP 5.0
     int BestIdx = getBestVariantMatchForContext(VMIs, OMPCtx);

llvm/lib/Frontend/OpenMP/OMPContext.cpp

@@ -27,7 +27,7 @@ using namespace omp;
 OMPContext::OMPContext(bool IsDeviceCompilation, Triple TargetTriple,
                        Triple TargetOffloadTriple, int DeviceNum) {
   // Add the appropriate target device kind trait based on the target triple
-  if (!TargetOffloadTriple.getTriple().empty() && DeviceNum > 0) {
+  if (!TargetOffloadTriple.getTriple().empty() && DeviceNum > -1) {
     // If target triple is present, then target device is not a host
     ActiveTraits.set(unsigned(TraitProperty::target_device_kind_nohost));
     switch (TargetOffloadTriple.getArch()) {