src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2017-04-20 21:48:54 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2017-04-20 21:48:54 +0000
commit	6bc11b14146b9a41402d0348438ff4edb1e344cd (patch)
tree	a3128f15d970747b64d8aaaa66d9fe8c176bef8a /contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp
parent	554491ffbdcfe51993d5b436a9bbca7aba388dd3 (diff)
parent	583e75cce441388bc562fa225d23499261a0091e (diff)

Merge llvm, clang, lld and lldb trunk r300890, and update build glue.

Notes

Notes: svn path=/projects/clang500-import/; revision=317230

Diffstat (limited to 'contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp')

-rw-r--r--

contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp

1 files changed, 42 insertions, 56 deletions

diff --git a/contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp b/contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp
index a812884cd927..cccb2f075b65 100644
--- a/contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp
+++ b/contrib/llvm/tools/clang/lib/AST/StmtOpenMP.cpp

@@ -147,10 +147,6 @@ OMPForDirective::Create(const ASTContext &C, SourceLocation StartLoc,

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -201,10 +197,6 @@ OMPForSimdDirective::Create(const ASTContext &C, SourceLocation StartLoc,

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -368,10 +360,6 @@ OMPParallelForDirective *OMPParallelForDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -421,10 +409,6 @@ OMPParallelForSimdDirective *OMPParallelForSimdDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -759,10 +743,6 @@ OMPTargetParallelForDirective *OMPTargetParallelForDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -904,10 +884,6 @@ OMPTaskLoopDirective *OMPTaskLoopDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -957,10 +933,6 @@ OMPTaskLoopSimdDirective *OMPTaskLoopSimdDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1009,10 +981,6 @@ OMPDistributeDirective *OMPDistributeDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1095,6 +1063,13 @@ OMPDistributeParallelForDirective *OMPDistributeParallelForDirective::Create(

Dir->setUpdates(Exprs.Updates);

Dir->setFinals(Exprs.Finals);

Dir->setPreInits(Exprs.PreInits);

+ Dir->setCombinedLowerBoundVariable(Exprs.DistCombinedFields.LB);

+ Dir->setCombinedUpperBoundVariable(Exprs.DistCombinedFields.UB);

+ Dir->setCombinedEnsureUpperBound(Exprs.DistCombinedFields.EUB);

+ Dir->setCombinedInit(Exprs.DistCombinedFields.Init);

+ Dir->setCombinedCond(Exprs.DistCombinedFields.Cond);

+ Dir->setCombinedNextLowerBound(Exprs.DistCombinedFields.NLB);

+ Dir->setCombinedNextUpperBound(Exprs.DistCombinedFields.NUB);

return Dir;

}

@@ -1153,6 +1128,13 @@ OMPDistributeParallelForSimdDirective::Create(

Dir->setUpdates(Exprs.Updates);

Dir->setFinals(Exprs.Finals);

Dir->setPreInits(Exprs.PreInits);

+ Dir->setCombinedLowerBoundVariable(Exprs.DistCombinedFields.LB);

+ Dir->setCombinedUpperBoundVariable(Exprs.DistCombinedFields.UB);

+ Dir->setCombinedEnsureUpperBound(Exprs.DistCombinedFields.EUB);

+ Dir->setCombinedInit(Exprs.DistCombinedFields.Init);

+ Dir->setCombinedCond(Exprs.DistCombinedFields.Cond);

+ Dir->setCombinedNextLowerBound(Exprs.DistCombinedFields.NLB);

+ Dir->setCombinedNextUpperBound(Exprs.DistCombinedFields.NUB);

return Dir;

}

@@ -1200,10 +1182,6 @@ OMPDistributeSimdDirective *OMPDistributeSimdDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1256,10 +1234,6 @@ OMPTargetParallelForSimdDirective *OMPTargetParallelForSimdDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1352,10 +1326,6 @@ OMPTeamsDistributeDirective *OMPTeamsDistributeDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1407,10 +1377,6 @@ OMPTeamsDistributeSimdDirective *OMPTeamsDistributeSimdDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1474,6 +1440,13 @@ OMPTeamsDistributeParallelForSimdDirective::Create(

Dir->setUpdates(Exprs.Updates);

Dir->setFinals(Exprs.Finals);

Dir->setPreInits(Exprs.PreInits);

+ Dir->setCombinedLowerBoundVariable(Exprs.DistCombinedFields.LB);

+ Dir->setCombinedUpperBoundVariable(Exprs.DistCombinedFields.UB);

+ Dir->setCombinedEnsureUpperBound(Exprs.DistCombinedFields.EUB);

+ Dir->setCombinedInit(Exprs.DistCombinedFields.Init);

+ Dir->setCombinedCond(Exprs.DistCombinedFields.Cond);

+ Dir->setCombinedNextLowerBound(Exprs.DistCombinedFields.NLB);

+ Dir->setCombinedNextUpperBound(Exprs.DistCombinedFields.NUB);

return Dir;

}

@@ -1534,6 +1507,13 @@ OMPTeamsDistributeParallelForDirective::Create(

Dir->setUpdates(Exprs.Updates);

Dir->setFinals(Exprs.Finals);

Dir->setPreInits(Exprs.PreInits);

+ Dir->setCombinedLowerBoundVariable(Exprs.DistCombinedFields.LB);

+ Dir->setCombinedUpperBoundVariable(Exprs.DistCombinedFields.UB);

+ Dir->setCombinedEnsureUpperBound(Exprs.DistCombinedFields.EUB);

+ Dir->setCombinedInit(Exprs.DistCombinedFields.Init);

+ Dir->setCombinedCond(Exprs.DistCombinedFields.Cond);

+ Dir->setCombinedNextLowerBound(Exprs.DistCombinedFields.NLB);

+ Dir->setCombinedNextUpperBound(Exprs.DistCombinedFields.NUB);

return Dir;

}

@@ -1606,10 +1586,6 @@ OMPTargetTeamsDistributeDirective *OMPTargetTeamsDistributeDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);

@@ -1676,6 +1652,13 @@ OMPTargetTeamsDistributeParallelForDirective::Create(

Dir->setUpdates(Exprs.Updates);

Dir->setFinals(Exprs.Finals);

Dir->setPreInits(Exprs.PreInits);

+ Dir->setCombinedLowerBoundVariable(Exprs.DistCombinedFields.LB);

+ Dir->setCombinedUpperBoundVariable(Exprs.DistCombinedFields.UB);

+ Dir->setCombinedEnsureUpperBound(Exprs.DistCombinedFields.EUB);

+ Dir->setCombinedInit(Exprs.DistCombinedFields.Init);

+ Dir->setCombinedCond(Exprs.DistCombinedFields.Cond);

+ Dir->setCombinedNextLowerBound(Exprs.DistCombinedFields.NLB);

+ Dir->setCombinedNextUpperBound(Exprs.DistCombinedFields.NUB);

return Dir;

}

@@ -1739,6 +1722,13 @@ OMPTargetTeamsDistributeParallelForSimdDirective::Create(

Dir->setUpdates(Exprs.Updates);

Dir->setFinals(Exprs.Finals);

Dir->setPreInits(Exprs.PreInits);

+ Dir->setCombinedLowerBoundVariable(Exprs.DistCombinedFields.LB);

+ Dir->setCombinedUpperBoundVariable(Exprs.DistCombinedFields.UB);

+ Dir->setCombinedEnsureUpperBound(Exprs.DistCombinedFields.EUB);

+ Dir->setCombinedInit(Exprs.DistCombinedFields.Init);

+ Dir->setCombinedCond(Exprs.DistCombinedFields.Cond);

+ Dir->setCombinedNextLowerBound(Exprs.DistCombinedFields.NLB);

+ Dir->setCombinedNextUpperBound(Exprs.DistCombinedFields.NUB);

return Dir;

}

@@ -1789,10 +1779,6 @@ OMPTargetTeamsDistributeSimdDirective::Create(

Dir->setNextLowerBound(Exprs.NLB);

Dir->setNextUpperBound(Exprs.NUB);

Dir->setNumIterations(Exprs.NumIterations);

- Dir->setPrevLowerBoundVariable(Exprs.PrevLB);

- Dir->setPrevUpperBoundVariable(Exprs.PrevUB);

- Dir->setDistInc(Exprs.DistInc);

- Dir->setPrevEnsureUpperBound(Exprs.PrevEUB);

Dir->setCounters(Exprs.Counters);

Dir->setPrivateCounters(Exprs.PrivateCounters);

Dir->setInits(Exprs.Inits);