Skip to content
Draft
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions flang/lib/Lower/ConvertExprToHLFIR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1689,12 +1689,22 @@ class HlfirBuilder {
BinaryOp<D> binaryOp;
auto left = hlfir::loadTrivialScalar(loc, builder, gen(op.left()));
auto right = hlfir::loadTrivialScalar(loc, builder, gen(op.right()));

bool noReassoc = left.template getDefiningOp<hlfir::NoReassocOp>() ||
right.template getDefiningOp<hlfir::NoReassocOp>();
llvm::SmallVector<mlir::Value, 1> typeParams;
if constexpr (R::category == Fortran::common::TypeCategory::Character) {
binaryOp.genResultTypeParams(loc, builder, left, right, typeParams);
}
if (rank == 0)
return binaryOp.gen(loc, builder, op.derived(), left, right);
if (rank == 0) {
auto fmfBackup = builder.getFastMathFlags();
if (noReassoc)
builder.setFastMathFlags(fmfBackup &
~mlir::arith::FastMathFlags::reassoc);
auto res = binaryOp.gen(loc, builder, op.derived(), left, right);
builder.setFastMathFlags(fmfBackup);
return res;
}

// Elemental expression.
mlir::Type elementType =
Expand All @@ -1721,9 +1731,14 @@ class HlfirBuilder {
// nsw is never added to operations on vector subscripts
// even if -fno-wrapv is enabled.
builder.setIntegerOverflowFlags(mlir::arith::IntegerOverflowFlags::none);
auto fmfBackup = builder.getFastMathFlags();
if (noReassoc)
builder.setFastMathFlags(fmfBackup &
~mlir::arith::FastMathFlags::reassoc);
mlir::Value elemental = hlfir::genElementalOp(loc, builder, elementType,
shape, typeParams, genKernel,
/*isUnordered=*/true);
builder.setFastMathFlags(fmfBackup);
builder.setIntegerOverflowFlags(iofBackup);
fir::FirOpBuilder *bldr = &builder;
getStmtCtx().attachCleanup(
Expand Down