Skip to content

[Flang] Make handling of %VAL consistent with gfortran #157873

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 2 commits into from
Sep 15, 2025
Merged

[Flang] Make handling of %VAL consistent with gfortran #157873

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cd3570
[Flang] Make handling of %VAL consistent with gfortran
ceseo Sep 10, 2025
a437a8d
Prevent fir.convert operation from being generated between logical an…
ceseo Sep 10, 2025
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
36 changes: 15 additions & 21 deletions flang/lib/Lower/ConvertCall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@ static bool mustCastFuncOpToCopeWithImplicitInterfaceMismatch(
if (actualType != dummyType &&
!fir::ConvertOp::canBeConverted(actualType, dummyType))
return true;

// For %VAL arguments with implicit interfaces, we need to force an indirect
// call to ensure consistent behavior regardless of whether the procedure
// is defined in the same compilation unit or not. Check for mismatches
// where a by-value call site expects a reference type in the actual
// function definition.
for (auto [actualType, dummyType] :
llvm::zip(callSiteType.getInputs(), funcOpType.getInputs()))
if (!fir::isa_ref_type(actualType) && fir::isa_ref_type(dummyType) &&
fir::dyn_cast_ptrEleTy(dummyType) == actualType)
return true;
return false;
}

Expand Down Expand Up @@ -516,16 +527,8 @@ Fortran::lower::genCallOpAndResult(
mlir::Value cast;
auto *context = builder.getContext();

// Special handling for %VAL arguments: internal procedures expect
// reference parameters. When %VAL is used, the argument should be
// passed by value. Pass the originally loaded value.
if (fir::isa_ref_type(snd) && !fir::isa_ref_type(fst.getType()) &&
fir::dyn_cast_ptrEleTy(snd) == fst.getType()) {
auto loadOp = mlir::cast<fir::LoadOp>(fst.getDefiningOp());
mlir::Value originalStorage = loadOp.getMemref();
cast = originalStorage;
} else if (mlir::isa<fir::BoxProcType>(snd) &&
mlir::isa<mlir::FunctionType>(fst.getType())) {
if (mlir::isa<fir::BoxProcType>(snd) &&
mlir::isa<mlir::FunctionType>(fst.getType())) {
mlir::FunctionType funcTy = mlir::FunctionType::get(context, {}, {});
fir::BoxProcType boxProcTy = builder.getBoxProcType(funcTy);
if (mlir::Value host = argumentHostAssocs(converter, fst)) {
Expand Down Expand Up @@ -1668,17 +1671,8 @@ void prepareUserCallArguments(
break;
}
// For %VAL arguments, we should pass the value directly without
// conversion to reference types. If argTy is different from value type,
// it might be due to signature mismatch with internal procedures.
if (argTy == value.getType())
caller.placeInput(arg, value);
else if (fir::isa_ref_type(argTy) &&
fir::dyn_cast_ptrEleTy(argTy) == value.getType()) {
auto loadOp = mlir::cast<fir::LoadOp>(value.getDefiningOp());
mlir::Value originalStorage = loadOp.getMemref();
caller.placeInput(arg, originalStorage);
} else
caller.placeInput(arg, builder.createConvert(loc, argTy, value));
// conversion to reference types.
caller.placeInput(arg, builder.createConvert(loc, argTy, value));

} break;
case PassBy::BaseAddressValueAttribute:
Expand Down
5 changes: 4 additions & 1 deletion flang/test/Lower/percent-val-actual-argument.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ program main
call sa(%val(a1))
! CHECK: %[[A1_ADDR:.*]] = fir.address_of(@_QFEa1) : !fir.ref<!fir.logical<4>>
! CHECK: %[[A1_DECL:.*]]:2 = hlfir.declare %[[A1_ADDR]] {uniq_name = "_QFEa1"} : (!fir.ref<!fir.logical<4>>) -> (!fir.ref<!fir.logical<4>>, !fir.ref<!fir.logical<4>>)
! CHECK: fir.call @_QPsa(%[[A1_DECL]]#0) fastmath<contract> : (!fir.ref<!fir.logical<4>>) -> ()
! CHECK: %[[A1_LOADED:.*]] = fir.load %[[A1_DECL]]#0 : !fir.ref<!fir.logical<4>>
! CHECK: %[[SA_ADDR:.*]] = fir.address_of(@_QPsa) : (!fir.ref<!fir.logical<4>>) -> ()
! CHECK: %[[SA_CONVERT:.*]] = fir.convert %[[SA_ADDR]] : ((!fir.ref<!fir.logical<4>>) -> ()) -> ((!fir.logical<4>) -> ())
! CHECK: fir.call %[[SA_CONVERT]](%[[A1_LOADED]]) fastmath<contract> : (!fir.logical<4>) -> ()
! CHECK: func.func @_QPsa(%[[SA_ARG:.*]]: !fir.ref<!fir.logical<4>> {fir.bindc_name = "x1"}) {
write(6,*) "a1 = ", a1
end program main
Expand Down
Loading