From 0d454e8e087049ae86283e73a25cf8eaad488651 Mon Sep 17 00:00:00 2001 From: Tim Keith Date: Mon, 3 Aug 2020 12:21:57 -0700 Subject: [PATCH] [flang] Fix bug detecting intrinsic function Don't set the INTRINSIC attribute on a dummy procedure. Differential Revision: https://reviews.llvm.org/D85136 --- flang/lib/Semantics/resolve-names.cpp | 3 ++- flang/test/Semantics/symbol18.f90 | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp index e85dfa9..c5b4247 100644 --- a/flang/lib/Semantics/resolve-names.cpp +++ b/flang/lib/Semantics/resolve-names.cpp @@ -5749,7 +5749,8 @@ void ResolveNamesVisitor::HandleProcedureName( // error was reported } else { symbol = &Resolve(name, symbol)->GetUltimate(); - if (ConvertToProcEntity(*symbol) && IsIntrinsic(symbol->name())) { + if (ConvertToProcEntity(*symbol) && IsIntrinsic(symbol->name()) && + !IsDummy(*symbol)) { symbol->attrs().set(Attr::INTRINSIC); // 8.2(3): ignore type from intrinsic in type-declaration-stmt symbol->get().set_interface(ProcInterface{}); diff --git a/flang/test/Semantics/symbol18.f90 b/flang/test/Semantics/symbol18.f90 index b7269b7..93987f6 100644 --- a/flang/test/Semantics/symbol18.f90 +++ b/flang/test/Semantics/symbol18.f90 @@ -19,3 +19,13 @@ program p1 !REF: /p1/x y = f(x) end program + +!DEF: /f2 (Function) Subprogram REAL(4) +!DEF: /f2/cos EXTERNAL (Function, Implicit) ProcEntity REAL(4) +!DEF: /f2/x (Implicit) ObjectEntity REAL(4) +function f2(cos, x) + !DEF: /f2/f2 (Implicit) ObjectEntity REAL(4) + !REF: /f2/cos + !REF: /f2/x + f2 = cos(x) +end function -- 2.7.4