Skip to content

Delete code that was redundantly removing the elided extents before t… #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2021
Merged

Delete code that was redundantly removing the elided extents before t… #956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions flang/lib/Lower/ConvertVariable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,7 @@ static mlir::Value createNewLocal(Fortran::lower::AbstractConverter &converter,
const auto &ultimateSymbol = var.getSymbol().GetUltimate();
auto symNm = toStringRef(ultimateSymbol.name());
auto isTarg = var.isTarget();
if (shape.size())
if (auto arrTy = ty.dyn_cast<fir::SequenceType>()) {
// elide the constant dimensions before construction
assert(shape.size() == arrTy.getDimension());
llvm::SmallVector<mlir::Value> args;
auto typeShape = arrTy.getShape();
for (unsigned i = 0, end = arrTy.getDimension(); i < end; ++i)
if (typeShape[i] == fir::SequenceType::getUnknownExtent())
args.push_back(shape[i]);
return builder.allocateLocal(loc, ty, nm, symNm, args, lenParams, isTarg);
}
// Let the builder do all the heavy lifting.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment might be unnecessary / confusing?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True. On the other hand, I sort of wanted to indicate "don't overthink this here, this function is just a thin veneer over the real thing."

return builder.allocateLocal(loc, ty, nm, symNm, shape, lenParams, isTarg);
}

Expand Down