Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
33 changes: 28 additions & 5 deletions flang/lib/Lower/ConvertCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -494,10 +494,20 @@ Fortran::lower::genCallOpAndResult(
// arguments of any type and vice versa.
mlir::Value cast;
auto *context = builder.getContext();
if (mlir::isa<fir::BoxProcType>(snd) &&
mlir::isa<mlir::FunctionType>(fst.getType())) {
auto funcTy = mlir::FunctionType::get(context, {}, {});
auto boxProcTy = builder.getBoxProcType(funcTy);

// Special handling for %VAL arguments: internal procedures expect
// reference parameters. When %VAL is used, the argument should be
// passed by value. So we need to create a temporary variable and
// pass its address to avoid a type conversion error.
if (fir::isa_ref_type(snd) && !fir::isa_ref_type(fst.getType()) &&
fir::dyn_cast_ptrEleTy(snd) == fst.getType()) {
mlir::Value temp = builder.createTemporary(loc, fst.getType());
builder.create<fir::StoreOp>(loc, fst, temp);
cast = temp;
} else 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)) {
cast = fir::EmboxProcOp::create(builder, loc, boxProcTy,
llvm::ArrayRef<mlir::Value>{fst, host});
Expand Down Expand Up @@ -1637,7 +1647,20 @@ void prepareUserCallArguments(
(*cleanup)();
break;
}
caller.placeInput(arg, builder.createConvert(loc, argTy, value));
// 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()) {
// We're trying to convert value to reference - create temporary
mlir::Value temp = builder.createTemporary(loc, value.getType());
builder.create<fir::StoreOp>(loc, value, temp);
caller.placeInput(arg, temp);
} else
caller.placeInput(arg, builder.createConvert(loc, argTy, value));

} break;
case PassBy::BaseAddressValueAttribute:
case PassBy::CharBoxValueAttribute:
Expand Down
14 changes: 14 additions & 0 deletions flang/test/Lower/percent-val-actual-argument.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
! RUN: bbc %s -emit-fir -o - | FileCheck %s

program main
logical::a1
data a1/.true./
call sa(%val(a1))
! CHECK: fir.load %3 : !fir.ref<!fir.logical<4>>
! CHECK: fir.convert %13 : (!fir.logical<4>) -> i1
write(6,*) "a1 = ", a1
end program main

subroutine sa(x1)
logical::x1
end subroutine sa