[flang-commits] [flang] [flang] Catch both EXTERNAL and INTRINSIC on type declaration stmt (PR #150254)

[Peter Klausler via flang-commits]

https://github.com/klausler created https://github.com/llvm/llvm-project/pull/150254

The EXTERNAL and INTRINSIC attributes can't both appear on the same type declarations statement.

Fixes https://github.com/llvm/llvm-project/issues/149771.

>From ad964cc6dad0b8e407014384db91134278413af0 Mon Sep 17 00:00:00 2001
From: Peter Klausler <pklausler at nvidia.com>
Date: Wed, 23 Jul 2025 09:21:18 -0700
Subject: [PATCH] [flang] Catch both EXTERNAL and INTRINSIC on type declaration
 stmt

The EXTERNAL and INTRINSIC attributes can't both appear on the same
type declarations statement.

Fixes https://github.com/llvm/llvm-project/issues/149771.
---
 flang/lib/Semantics/resolve-names.cpp | 3 ++-
 flang/test/Semantics/resolve126.f90   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 flang/test/Semantics/resolve126.f90

diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index b3268605e7c0c..d08c669377cb2 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -2351,7 +2351,8 @@ bool AttrsVisitor::IsConflictingAttr(Attr attrName) {
       HaveAttrConflict(attrName, Attr::PASS, Attr::NOPASS) || // C781
       HaveAttrConflict(attrName, Attr::PURE, Attr::IMPURE) ||
       HaveAttrConflict(attrName, Attr::PUBLIC, Attr::PRIVATE) ||
-      HaveAttrConflict(attrName, Attr::RECURSIVE, Attr::NON_RECURSIVE);
+      HaveAttrConflict(attrName, Attr::RECURSIVE, Attr::NON_RECURSIVE) ||
+      HaveAttrConflict(attrName, Attr::INTRINSIC, Attr::EXTERNAL);
 }
 bool AttrsVisitor::CheckAndSet(Attr attrName) {
   if (IsConflictingAttr(attrName) || IsDuplicateAttr(attrName)) {
diff --git a/flang/test/Semantics/resolve126.f90 b/flang/test/Semantics/resolve126.f90
new file mode 100644
index 0000000000000..6313f8c539bf8
--- /dev/null
+++ b/flang/test/Semantics/resolve126.f90
@@ -0,0 +1,7 @@
+! RUN: %python %S/test_errors.py %s %flang_fc1
+!ERROR: Attributes 'INTRINSIC' and 'EXTERNAL' conflict with each other
+real, external, intrinsic :: exp
+!ERROR: Symbol 'sin' cannot have both EXTERNAL and INTRINSIC attributes
+external sin
+intrinsic sin
+end