diff --git a/include/clang/Basic/OpenMPKinds.def b/include/clang/Basic/OpenMPKinds.def index 143cb3fb6098ebb0c3023e8e671982499f79170f..1ece2ec4f49019c015edae743ad4560862b475d6 100644 --- a/include/clang/Basic/OpenMPKinds.def +++ b/include/clang/Basic/OpenMPKinds.def @@ -348,6 +348,8 @@ OPENMP_AFFINITY_KIND(thread) OPENMP_DEPEND_KIND(in) OPENMP_DEPEND_KIND(out) OPENMP_DEPEND_KIND(inout) +OPENMP_DEPEND_KIND(concurrent) +OPENMP_DEPEND_KIND(commute) OPENMP_DEPEND_KIND(cw) OPENMP_DEPEND_KIND(source) OPENMP_DEPEND_KIND(sink) diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp index c5f72e518dd2716e973760526ef4129acdbd10d7..42eb59d23eca1e73e2803ced26c3f369a78ddc51 100644 --- a/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/lib/CodeGen/CGOpenMPRuntime.cpp @@ -4032,7 +4032,7 @@ void CGOpenMPRuntime::emitTaskCall(CodeGenFunction &CGF, SourceLocation Loc, unsigned NumDependencies = Data.Dependences.size(); if (NumDependencies) { // Dependence kind for RTL. - enum RTLDependenceKindTy { DepIn = 0x01, DepOut = 0x02, DepInOut = 0x3, DepCW = 0x04 }; + enum RTLDependenceKindTy { DepIn = 0x01, DepOut = 0x02, DepInOut = 0x3, DepCW = 0x04, DepCommute = 0x08 }; enum RTLDependInfoFieldsTy { BaseAddr, Len, Flags }; RecordDecl *KmpDependInfoRD; QualType FlagsTy = @@ -4096,8 +4096,12 @@ void CGOpenMPRuntime::emitTaskCall(CodeGenFunction &CGF, SourceLocation Loc, case OMPC_DEPEND_inout: DepKind = DepInOut; break; + case OMPC_DEPEND_concurrent: case OMPC_DEPEND_cw: - DepKind = DepCW; + DepKind = RTLDependenceKindTy(int(DepCW)|int(DepInOut)); + break; + case OMPC_DEPEND_commute: + DepKind = RTLDependenceKindTy(int(DepCommute)|int(DepInOut)); break; case OMPC_DEPEND_source: case OMPC_DEPEND_sink: