Skip to content

Commit f725fac

Browse files
committed
[flang][OpenMP] Move clause/object conversion to happen early, in genOMP
This removes the last use of genOmpObectList2, which has now been removed.
1 parent ec0ed50 commit f725fac

File tree

5 files changed

+218
-252
lines changed

5 files changed

+218
-252
lines changed

flang/lib/Lower/OpenMP/ClauseProcessor.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ class ClauseProcessor {
4949
public:
5050
ClauseProcessor(Fortran::lower::AbstractConverter &converter,
5151
Fortran::semantics::SemanticsContext &semaCtx,
52-
const Fortran::parser::OmpClauseList &clauses)
53-
: converter(converter), semaCtx(semaCtx),
54-
clauses(makeClauses(clauses, semaCtx)) {}
52+
const List<Clause> &clauses)
53+
: converter(converter), semaCtx(semaCtx), clauses(clauses) {}
5554

5655
// 'Unique' clauses: They can appear at most once in the clause list.
5756
bool processCollapse(

flang/lib/Lower/OpenMP/DataSharingProcessor.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,12 @@ class DataSharingProcessor {
7878
public:
7979
DataSharingProcessor(Fortran::lower::AbstractConverter &converter,
8080
Fortran::semantics::SemanticsContext &semaCtx,
81-
const Fortran::parser::OmpClauseList &opClauseList,
81+
const List<Clause> &clauses,
8282
Fortran::lower::pft::Evaluation &eval,
8383
bool useDelayedPrivatization = false,
8484
Fortran::lower::SymMap *symTable = nullptr)
8585
: hasLastPrivateOp(false), converter(converter),
86-
firOpBuilder(converter.getFirOpBuilder()),
87-
clauses(omp::makeClauses(opClauseList, semaCtx)), eval(eval),
86+
firOpBuilder(converter.getFirOpBuilder()), clauses(clauses), eval(eval),
8887
useDelayedPrivatization(useDelayedPrivatization), symTable(symTable) {}
8988

9089
// Privatisation is split into two steps.

0 commit comments

Comments
 (0)