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

[via flang-commits]

Author: Peter Klausler
Date: 2025-07-25T14:48:01-07:00
New Revision: 129db4dc3e53abd0021dc443d68fdadb1d8dd27d

URL: https://github.com/llvm/llvm-project/commit/129db4dc3e53abd0021dc443d68fdadb1d8dd27d
DIFF: https://github.com/llvm/llvm-project/commit/129db4dc3e53abd0021dc443d68fdadb1d8dd27d.diff

LOG: [flang] Catch both EXTERNAL and INTRINSIC on type declaration stmt (#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.

Added: 
    flang/test/Semantics/resolve126.f90

Modified: 
    flang/lib/Semantics/resolve-names.cpp

Removed: 
    


################################################################################
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