This is an archive of the discontinued LLVM Phabricator instance.

Differential D85136

[flang] Fix bug detecting intrinsic function
ClosedPublic

Authored by tskeith on Aug 3 2020, 7:44 AM.

Details

Reviewers
klausler
PeteSteinfeld
jdoerfert
DavidTruby
sscalpone
Commits
rG0d454e8e0870: [flang] Fix bug detecting intrinsic function
Summary

Don't set the INTRINSIC attribute on a dummy procedure.

Diff Detail

Event Timeline

tskeith created this revision.Aug 3 2020, 7:44 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptAug 3 2020, 7:44 AM
Herald added a reviewer: DavidTruby. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
tskeith requested review of this revision.Aug 3 2020, 7:44 AM
Harbormaster completed remote builds in B66771: Diff 282622.Aug 3 2020, 8:24 AM
PeteSteinfeld accepted this revision.Aug 3 2020, 8:49 AM

The changes look good to me. Note that I haven't actually built and tested this since my builds are broken.

This revision is now accepted and ready to land.Aug 3 2020, 8:49 AM
sscalpone accepted this revision.Aug 3 2020, 12:17 PM
sscalpone added a subscriber: sscalpone.

Fix fm324 and fm333. Thanks

Closed by commit rG0d454e8e0870: [flang] Fix bug detecting intrinsic function (authored by tskeith). · Explain WhyAug 3 2020, 12:22 PM
This revision was automatically updated to reflect the committed changes.
tskeith added a commit: rG0d454e8e0870: [flang] Fix bug detecting intrinsic function.

Revision Contents

PathSize
flang/
lib/
Semantics/
3 lines
test/
Semantics/
10 lines

Diff 282698

flang/lib/Semantics/resolve-names.cpp

Show First 20 Lines • Show All 5,743 Lines • ▼ Show 20 Lines if (!symbol) {
ConvertToProcEntity(*symbol); ConvertToProcEntity(*symbol);
SetProcFlag(name, *symbol, flag); SetProcFlag(name, *symbol, flag);
} else if (symbol->has<UnknownDetails>()) { } else if (symbol->has<UnknownDetails>()) {
DIE("unexpected UnknownDetails"); DIE("unexpected UnknownDetails");
} else if (CheckUseError(name)) { } else if (CheckUseError(name)) {
// error was reported // error was reported
} else { } else {
symbol = &Resolve(name, symbol)->GetUltimate(); symbol = &Resolve(name, symbol)->GetUltimate();
if (ConvertToProcEntity(*symbol) && IsIntrinsic(symbol->name())) { if (ConvertToProcEntity(*symbol) && IsIntrinsic(symbol->name()) &&
!IsDummy(*symbol)) {
symbol->attrs().set(Attr::INTRINSIC); symbol->attrs().set(Attr::INTRINSIC);
// 8.2(3): ignore type from intrinsic in type-declaration-stmt // 8.2(3): ignore type from intrinsic in type-declaration-stmt
symbol->get<ProcEntityDetails>().set_interface(ProcInterface{}); symbol->get<ProcEntityDetails>().set_interface(ProcInterface{});
} }
if (!SetProcFlag(name, *symbol, flag)) { if (!SetProcFlag(name, *symbol, flag)) {
return; // reported error return; // reported error
} }
if (IsProcedure(*symbol) || symbol->has<DerivedTypeDetails>() || if (IsProcedure(*symbol) || symbol->has<DerivedTypeDetails>() ||
▲ Show 20 Lines • Show All 705 Lines • Show Last 20 Lines

flang/test/Semantics/symbol18.f90

Show All 13 Lines
!DEF: /p1/sin INTRINSIC (Function) ProcEntity !DEF: /p1/sin INTRINSIC (Function) ProcEntity
!REF: /p1/x !REF: /p1/x
y = sin(x) y = sin(x)
!REF: /p1/y !REF: /p1/y
!DEF: /f EXTERNAL (Function, Implicit) ProcEntity REAL(4) !DEF: /f EXTERNAL (Function, Implicit) ProcEntity REAL(4)
!REF: /p1/x !REF: /p1/x
y = f(x) y = f(x)
end program 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