Skip to content

Commit

Permalink
[flang][hlfir] probe ultimate intrinsic module procedure name
Browse files Browse the repository at this point in the history
HLFIR lowering was currently hitting errors like "not yet implemented:
intrinsic: z0$iso_c_binding$c_associated_c_ptr". These error were caused
by HLFIR lowering using the name with the full context instead of
the ultimate one.
I do not want to change proc.GetName() because I think it may be best
if it retains the full context for its usages in semantics, so I fixed
the helper to get the name in lowering to HLFIR.

Differential Revision: https://reviews.llvm.org/D154230
  • Loading branch information
jeanPerier committed Jun 30, 2023
1 parent 2d46264 commit 247bad1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
6 changes: 5 additions & 1 deletion flang/lib/Lower/ConvertCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,11 @@ struct CallContext {

fir::FirOpBuilder &getBuilder() { return converter.getFirOpBuilder(); }

std::string getProcedureName() const { return procRef.proc().GetName(); }
std::string getProcedureName() const {
if (const Fortran::semantics::Symbol *sym = procRef.proc().GetSymbol())
return sym->GetUltimate().name().ToString();
return procRef.proc().GetName();
}

/// Is this a call to an elemental procedure with at least one array argument?
bool isElementalProcWithArrayArgs() const {
Expand Down
11 changes: 11 additions & 0 deletions flang/test/Lower/HLFIR/intrinsic-module-procedures.f90
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,14 @@ subroutine foo(cptr, x)
! CHECK: %[[VAL_8:.*]] = fir.box_addr %[[VAL_4]] : (!fir.box<i32>) -> !fir.ref<i32>
! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (!fir.ref<i32>) -> i64
! CHECK: fir.store %[[VAL_9]] to %[[VAL_7]] : !fir.ref<i64>

subroutine test_renaming(p)
use iso_c_binding, only: c_associated_alias => c_associated, c_ptr
type(c_ptr) p
print *, c_associated_alias(p)
end subroutine

! CHECK-LABEL: func.func @_QPtest_renaming
! CHECK: %[[C_PTR_TARG:.*]] = fir.load %{{.*}} : !fir.ref<i64>
! CHECK: %[[NULL:.*]] = arith.constant 0 : i64
! CHECK: arith.cmpi ne, %[[C_PTR_TARG]], %[[NULL]] : i64

0 comments on commit 247bad1

Please sign in to comment.