Fix some 'depend' clause diagnostics, compiler warnings and update some code to upstream

Author: mikaoP

clang/lib/CodeGen/CGOmpSsRuntime.cpp

@@ -1166,17 +1166,17 @@ static llvm::Function *createComputeDepFunction(CodeGenFunction &CGF,
   SmallVector<llvm::Type *, 4> ArgsTypeList;
   SmallVector<llvm::Value *, 4> ArgsValueList;
 
-  for (const auto p : ExprInvolvedVarList) {
+  for (const auto &p : ExprInvolvedVarList) {
     llvm::Value *V = p.second.getPointer(CGF);
     ArgsTypeList.push_back(V->getType());
     ArgsValueList.push_back(V);
   }
-  for (const auto p : VLASizeInvolvedMap) {
+  for (const auto &p : VLASizeInvolvedMap) {
     llvm::Value *V = p.second;
     ArgsTypeList.push_back(V->getType());
     ArgsValueList.push_back(V);
   }
-  for (const auto p : CaptureInvolvedMap) {
+  for (const auto &p : CaptureInvolvedMap) {
     Address Addr = p.second;
     llvm::Value *V = Addr.getPointer();
     ArgsTypeList.push_back(V->getType());
@@ -1260,7 +1260,7 @@ void CGOmpSsRuntime::EmitDependencyList(
   {
     CodeGenFunction::OSSPrivateScope InitScope(NewCGF);
     auto ArgI = ComputeDepFun->arg_begin();
-    for (const auto p : DependInfoGathering.getInvolvedVarList()) {
+    for (const auto &p : DependInfoGathering.getInvolvedVarList()) {
       const VarDecl *VD = p.first;
       LValue LV = p.second;
       InitScope.addPrivate(VD, [&ArgI, &LV]() -> Address {
@@ -1269,7 +1269,7 @@ void CGOmpSsRuntime::EmitDependencyList(
 
       ++ArgI;
     }
-    for (const auto p : DependInfoGathering.getVLASizeInvolvedMap()) {
+    for (const auto &p : DependInfoGathering.getVLASizeInvolvedMap()) {
       const Expr *VLASizeExpr = p.first;
       InitScope.addPrivateVLA(VLASizeExpr, [ArgI]() -> llvm::Value * {
         return ArgI;
@@ -1278,7 +1278,7 @@ void CGOmpSsRuntime::EmitDependencyList(
       ++ArgI;
     }
     CaptureMapTy CaptureReplacedMap;
-    for (const auto p : DependInfoGathering.getCaptureInvolvedMap()) {
+    for (const auto &p : DependInfoGathering.getCaptureInvolvedMap()) {
       const VarDecl *VD = p.first;
       Address Addr = p.second;
       Address NewAddr = Address(ArgI, Addr.getAlignment());
@@ -1405,15 +1405,15 @@ void CGOmpSsRuntime::EmitDependencyList(
   List.push_back(DependInfoGathering.getBaseValue());
   List.push_back(ComputeDepFun);
 
-  for (const auto p : DependInfoGathering.getInvolvedVarList()) {
+  for (const auto &p : DependInfoGathering.getInvolvedVarList()) {
     LValue LV = p.second;
     List.push_back(LV.getPointer(CGF));
   }
-  for (const auto p : DependInfoGathering.getVLASizeInvolvedMap()) {
+  for (const auto &p : DependInfoGathering.getVLASizeInvolvedMap()) {
     llvm::Value *VLASizeValue = p.second;
     List.push_back(VLASizeValue);
   }
-  for (const auto p : DependInfoGathering.getCaptureInvolvedMap()) {
+  for (const auto &p : DependInfoGathering.getCaptureInvolvedMap()) {
     Address Addr = p.second;
     llvm::Value *V = Addr.getPointer();
     List.push_back(V);

clang/lib/Sema/SemaOmpSs.cpp

@@ -1415,16 +1415,15 @@ bool Sema::ActOnOmpSsDependKinds(ArrayRef<OmpSsDependClauseKind> DepKinds,
         Diag(DepLoc, diag::err_oss_depend_weak_required);
         return false;
       } else if (numUnk == 2) {
-        unsigned Except[] = {OSSC_DEPEND_inoutset, OSSC_DEPEND_mutexinoutset};
         Diag(DepLoc, diag::err_oss_unexpected_clause_value)
             << getListOfPossibleValues(OSSC_depend, /*First=*/0,
-                                       /*Last=*/OSSC_DEPEND_unknown, Except)
+                                       /*Last=*/OSSC_DEPEND_unknown)
             << getOmpSsClauseName(OSSC_depend);
         return false;
       }
     } else if ((numWeaks == 1 && numUnk == 1)
                || (numWeaks == 2 && numUnk == 0)) {
-        unsigned Except[] = {OSSC_DEPEND_weak, OSSC_DEPEND_inoutset, OSSC_DEPEND_mutexinoutset};
+        unsigned Except[] = {OSSC_DEPEND_weak, OSSC_DEPEND_inoutset};
         Diag(DepLoc, diag::err_oss_unexpected_clause_value)
             << getListOfPossibleValues(OSSC_depend, /*First=*/0,
                                        /*Last=*/OSSC_DEPEND_unknown, Except)
@@ -2045,9 +2044,9 @@ static bool actOnOSSReductionKindClause(
         if (auto *ComplexTy = OrigType->getAs<ComplexType>())
           Type = ComplexTy->getElementType();
         if (Type->isRealFloatingType()) {
-          llvm::APFloat InitValue =
-              llvm::APFloat::getAllOnesValue(Context.getTypeSize(Type),
-                                             /*isIEEE=*/true);
+          llvm::APFloat InitValue = llvm::APFloat::getAllOnesValue(
+              Context.getFloatTypeSemantics(Type),
+              Context.getTypeSize(Type));
           Init = FloatingLiteral::Create(Context, InitValue, /*isexact=*/true,
                                          Type, ELoc);
         } else if (Type->isScalarType()) {

clang/test/OmpSs/Sema/task_depend.cpp

@@ -77,14 +77,14 @@ int main(int argc, char **argv, char *env[]) {
   #pragma oss task inoutset(argc) // expected-warning {{extra tokens at the end of '#pragma oss task' are ignored}}
 
   #pragma oss task depend(in : arr[0])
-  #pragma oss task depend(, // expected-error {{expected 'in', 'out', 'inout' or 'weak' in OmpSs-2 clause 'depend'}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-warning {{missing ':' after dependency type - ignoring}}
-  #pragma oss task depend(, : // expected-error {{expected 'in', 'out', 'inout' or 'weak' in OmpSs-2 clause 'depend'}} expected-error {{expected ')'}} expected-note {{to match this '('}}
-  #pragma oss task depend(, : ) // expected-error {{expected 'in', 'out', 'inout' or 'weak' in OmpSs-2 clause 'depend'}}
+  #pragma oss task depend(, // expected-error {{expected 'in', 'out', 'inout', 'inoutset', 'mutexinoutset' or 'weak' in OmpSs-2 clause 'depend'}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-warning {{missing ':' after dependency type - ignoring}}
+  #pragma oss task depend(, : // expected-error {{expected 'in', 'out', 'inout', 'inoutset', 'mutexinoutset' or 'weak' in OmpSs-2 clause 'depend'}} expected-error {{expected ')'}} expected-note {{to match this '('}}
+  #pragma oss task depend(, : ) // expected-error {{expected 'in', 'out', 'inout', 'inoutset', 'mutexinoutset' or 'weak' in OmpSs-2 clause 'depend'}}
   #pragma oss task depend(in, weak: ) // expected-error {{expected expression}}
   #pragma oss task depend(weak, in: ) // expected-error {{expected expression}}
-  #pragma oss task depend(, weak: argc) // expected-error {{expected 'in', 'out' or 'inout' in OmpSs-2 clause 'depend'}}
-  #pragma oss task depend(weak, : argc) // expected-error {{expected 'in', 'out' or 'inout' in OmpSs-2 clause 'depend'}}
-  #pragma oss task depend(weak, weak: argc) // expected-error {{expected 'in', 'out' or 'inout' in OmpSs-2 clause 'depend'}}
+  #pragma oss task depend(, weak: argc) // expected-error {{expected 'in', 'out', 'inout' or 'mutexinoutset' in OmpSs-2 clause 'depend'}}
+  #pragma oss task depend(weak, : argc) // expected-error {{expected 'in', 'out', 'inout' or 'mutexinoutset' in OmpSs-2 clause 'depend'}}
+  #pragma oss task depend(weak, weak: argc) // expected-error {{expected 'in', 'out', 'inout' or 'mutexinoutset' in OmpSs-2 clause 'depend'}}
   #pragma oss task depend(in, in: argc) // expected-error {{expected 'weak' dependency type}}
   #pragma oss task depend(out, in: argc) // expected-error {{expected 'weak' dependency type}}
   #pragma oss task depend(weak, in: 1) // expected-error {{expected addressable lvalue expression, array element, array shape or array section}}