Skip to content

Commit

Permalink
Revert "[Flang][OpenMP] Fix to support privatisation of alloc strings…
Browse files Browse the repository at this point in the history
… (#71204)"

This reverts commit 192bee0.
Reverting to fix the CI.  https://lab.llvm.org/buildbot/#/builders/21/builds/84995
  • Loading branch information
kiranchandramohan committed Nov 7, 2023
1 parent 192bee0 commit ba116ff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 80 deletions.
29 changes: 10 additions & 19 deletions flang/lib/Lower/Bridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -677,27 +677,18 @@ class FirConverter : public Fortran::lower::AbstractConverter {
if (auto seqTy = symType.dyn_cast<fir::SequenceType>()) {
fir::ExtendedValue read = fir::factory::genMutableBoxRead(
*builder, loc, box, /*mayBePolymorphic=*/false);
if (auto read_arr_box = read.getBoxOf<fir::ArrayBoxValue>()) {
fir::factory::genInlinedAllocation(
*builder, loc, *new_box, read_arr_box->getLBounds(),
read_arr_box->getExtents(),
/*lenParams=*/std::nullopt, name,
/*mustBeHeap=*/true);
} else if (auto read_char_arr_box =
read.getBoxOf<fir::CharArrayBoxValue>()) {
fir::factory::genInlinedAllocation(
*builder, loc, *new_box, read_char_arr_box->getLBounds(),
read_char_arr_box->getExtents(),
read_char_arr_box->getLen(), name,
/*mustBeHeap=*/true);
} else {
TODO(loc, "Unhandled allocatable box type");
}
auto read_box = read.getBoxOf<fir::ArrayBoxValue>();
fir::factory::genInlinedAllocation(
*builder, loc, *new_box, read_box->getLBounds(),
read_box->getExtents(),
/*lenParams=*/std::nullopt, name,
/*mustBeHeap=*/true);
} else {
fir::factory::genInlinedAllocation(
*builder, loc, *new_box, box.getMutableProperties().lbounds,
box.getMutableProperties().extents,
box.nonDeferredLenParams(), name,
*builder, loc, *new_box,
new_box->getMutableProperties().lbounds,
new_box->getMutableProperties().extents,
/*lenParams=*/std::nullopt, name,
/*mustBeHeap=*/true);
}
});
Expand Down
61 changes: 0 additions & 61 deletions flang/test/Lower/OpenMP/parallel-private-clause-str.f90

This file was deleted.

0 comments on commit ba116ff

Please sign in to comment.