Skip to content

[flang] Fix lowering of unused dummy procedure pointers #155649

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[flang] Fix lowering of unused dummy procedure pointers #155649

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions flang/include/flang/Lower/CallInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,12 @@ getOrDeclareFunction(const Fortran::evaluate::ProcedureDesignator &,
mlir::Type getDummyProcedureType(const Fortran::semantics::Symbol &dummyProc,
Fortran::lower::AbstractConverter &);

/// Return the type of an argument that is a dummy procedure pointer. This
/// will be a reference to a boxed procedure.
mlir::Type
getDummyProcedurePointerType(const Fortran::semantics::Symbol &dummyProcPtr,
Fortran::lower::AbstractConverter &);

/// Return !fir.boxproc<() -> ()> type.
mlir::Type getUntypedBoxProcType(mlir::MLIRContext *context);

Expand Down
11 changes: 11 additions & 0 deletions flang/lib/Lower/CallInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,17 @@ mlir::Type Fortran::lower::getDummyProcedureType(
return procType;
}

mlir::Type Fortran::lower::getDummyProcedurePointerType(
const Fortran::semantics::Symbol &dummyProcPtr,
Fortran::lower::AbstractConverter &converter) {
std::optional<Fortran::evaluate::characteristics::Procedure> iface =
Fortran::evaluate::characteristics::Procedure::Characterize(
dummyProcPtr, converter.getFoldingContext());
mlir::Type procPtrType = getProcedureDesignatorType(
iface.has_value() ? &*iface : nullptr, converter);
return fir::ReferenceType::get(procPtrType);
}

bool Fortran::lower::isCPtrArgByValueType(mlir::Type ty) {
return mlir::isa<fir::ReferenceType>(ty) &&
fir::isa_integer(fir::unwrapRefType(ty));
Expand Down
22 changes: 13 additions & 9 deletions flang/lib/Lower/ConvertVariable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,15 +2149,19 @@ void Fortran::lower::mapSymbolAttributes(
if (Fortran::semantics::IsProcedure(sym)) {
if (isUnusedEntryDummy) {
// Additional discussion below.
mlir::Type dummyProcType =
Fortran::lower::getDummyProcedureType(sym, converter);
mlir::Value undefOp = fir::UndefOp::create(builder, loc, dummyProcType);

Fortran::lower::genDeclareSymbol(converter, symMap, sym, undefOp);
}

// Procedure pointer.
if (Fortran::semantics::IsPointer(sym)) {
if (Fortran::semantics::IsPointer(sym)) {
mlir::Type procPtrType =
Fortran::lower::getDummyProcedurePointerType(sym, converter);
mlir::Value undefOp = fir::UndefOp::create(builder, loc, procPtrType);
genProcPointer(converter, symMap, sym, undefOp, replace);
} else {
mlir::Type dummyProcType =
Fortran::lower::getDummyProcedureType(sym, converter);
mlir::Value undefOp = fir::UndefOp::create(builder, loc, dummyProcType);
Fortran::lower::genDeclareSymbol(converter, symMap, sym, undefOp);
}
} else if (Fortran::semantics::IsPointer(sym)) {
// Used procedure pointer.
// global
mlir::Value boxAlloc = preAlloc;
// dummy or passed result
Expand Down
59 changes: 59 additions & 0 deletions flang/test/Lower/HLFIR/dummy-proc-ptr-in-entry.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
! Test dummy procedure pointers that are not an argument in every entry.
! This requires creating a mock value in the entries where it is not an
! argument.
!
!RUN: %flang_fc1 -emit-hlfir %s -o - 2>&1 | FileCheck %s

!CHECK-LABEL: func @_QPdummy_char_proc_ptr() -> !fir.boxproc<(!fir.ref<!fir.char<1>>, index) -> !fir.boxchar<1>> {
!CHECK: %[[UNDEF:.*]] = fir.undefined !fir.ref<!fir.boxproc<() -> ()>>
!CHECK: %{{.*}}:2 = hlfir.declare %[[UNDEF]]
!CHECK-SAME: {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFdummy_char_proc_ptrEdummy"}
!CHECK-SAME: : (!fir.ref<!fir.boxproc<() -> ()>>)
!CHECK-SAME: -> (!fir.ref<!fir.boxproc<() -> ()>>, !fir.ref<!fir.boxproc<() -> ()>>)

!CHECK-LABEL: func @_QPdummy_char_proc_ptr_entry(
!CHECK-SAME: %[[ARG:.*]]: !fir.ref<!fir.boxproc<() -> ()>>)
!CHECK-SAME: -> !fir.boxproc<(!fir.ref<!fir.char<1>>, index) -> !fir.boxchar<1>> {
!CHECK: %{{.*}}:2 = hlfir.declare %[[ARG]] dummy_scope %{{[^ ]*}}
!CHECK-SAME: {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFdummy_char_proc_ptrEdummy"}
!CHECK-SAME: : (!fir.ref<!fir.boxproc<() -> ()>>, !fir.dscope)
!CHECK-SAME: -> (!fir.ref<!fir.boxproc<() -> ()>>, !fir.ref<!fir.boxproc<() -> ()>>)
function dummy_char_proc_ptr() result(fun)
interface
character function char_fun()
end function
end interface

procedure (char_fun), pointer :: fun, dummy_char_proc_ptr_entry, dummy
fun => null()
return

entry dummy_char_proc_ptr_entry(dummy)
end function

!CHECK-LABEL: func @_QPdummy_int_proc_ptr()
!CHECK: %[[UNDEF:.*]] = fir.undefined !fir.ref<!fir.boxproc<() -> ()>>
!CHECK: %{{.*}}:2 = hlfir.declare %[[UNDEF]]
!CHECK-SAME: {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFdummy_int_proc_ptrEdummy"}
!CHECK-SAME: : (!fir.ref<!fir.boxproc<() -> ()>>)
!CHECK-SAME: -> (!fir.ref<!fir.boxproc<() -> ()>>, !fir.ref<!fir.boxproc<() -> ()>>)

!CHECK-LABEL: func @_QPdummy_int_proc_ptr_entry(
!CHECK-SAME: %[[ARG:.*]]: !fir.ref<!fir.boxproc<() -> ()>>)
!CHECK-SAME: -> !fir.boxproc<() -> i32> {
!CHECK: %{{.*}}:2 = hlfir.declare %[[ARG]] dummy_scope %{{[^ ]*}}
!CHECK-SAME: {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFdummy_int_proc_ptrEdummy"}
!CHECK-SAME: : (!fir.ref<!fir.boxproc<() -> ()>>, !fir.dscope)
!CHECK-SAME: -> (!fir.ref<!fir.boxproc<() -> ()>>, !fir.ref<!fir.boxproc<() -> ()>>)
function dummy_int_proc_ptr() result(fun)
interface
integer function int_fun()
end function
end interface

procedure (int_fun), pointer :: fun, dummy_int_proc_ptr_entry, dummy
fun => null()
return

entry dummy_int_proc_ptr_entry(dummy)
end function